mac: update of macosx_bundle.sh (#5786)
Various changes to improve compilation of RT on macOS thanks to @Benitoite and @Pandagrapher * mac: use sed -i.bak, add X's to mktemp template in macosx_bundle.sh * mac: test lensfun version in macosx_bundle.sh to select correct lensfun database version (version_1 for 3.2 and version_2 for 3.95) * mac: remove DYLD_FALLBACK_LIBRARY_PATH from main Info.plist * mac: removes some -cli codesigning commands * mac: remove erroneous newlines in macosx_bundle.sh and suppress superfluous codesigning of Contents/Frameworks/*dylib * mac: Apple arm64/homebrew compatibility update * mac: CMakeLists.txt arm64 homebrew compatibility * mac: add Apple arm64 CPU native flag * mac: fix pixbuf query syntax * mac: adapt. of Pandagrapher's patch * mac: additional instructions for the -cli exec. * mac: revert target 10 * mac: remove legacy environment variable Per https://github.com/Beep6581/RawTherapee/pull/5786#issuecomment-792276656 * mac: fix destination of credits/license * mac: copy {LOCAL_PREFIX}/share/locale to bundle * mac: fixes a path for the License * mac: fix of UpdateInfo command structure * mac: remove redundant copying * mac: use cmake to configure Info.plist values * mac: configurator for Info.plist version values * mac: fix locale detection / language * mac: remove an outdated key from Info.plist * mac: fix path usage for gtk.immodules / locale dir * mac: revert a change merged elsewhere * mac: follow more symlinks for 'brew builds * mac: link to CoreFoundation for locale detection * mac: link CoreFoundation for locale / C * mac: detect locale with CoreFoundation per https://github.com/Beep6581/RawTherapee/pull/5786#issuecomment-798926898 * mac: remove outdated lines * Update multilangmgr.cc * mac: Info.plist language fixes (Pandagrapher) https://github.com/Beep6581/RawTherapee/pull/5786#issuecomment-813004475 * Mac: also package libpng12 for homebrew compatibility. * macOS packaging and language updates
This commit is contained in:
@@ -175,7 +175,7 @@ if(APPLE) # TODO make -mtune generic conditional and/or specifiable.
|
||||
if(CMAKE_CXX_COMPILER MATCHES "g\\+\\+-mp-4.[5-8]"
|
||||
OR CMAKE_CXX_COMPILER_ARG1 MATCHES "g\\+\\+-mp-4.[5-8]")
|
||||
set(CMAKE_EXE_LINKER_FLAGS
|
||||
"${CMAKE_EXE_LINKER_FLAGS} /usr/lib/libstdc++.6.dylib -Wl,-headerpad_max_install_names -mtune=generic"
|
||||
"${CMAKE_EXE_LINKER_FLAGS} /usr/lib/libstdc++.6.dylib -Wl,-headerpad_max_install_names -mtune=generic -framework Foundation"
|
||||
)
|
||||
message(
|
||||
STATUS
|
||||
@@ -190,7 +190,7 @@ if(APPLE) # TODO make -mtune generic conditional and/or specifiable.
|
||||
set(CMAKE_C_FLAGS
|
||||
"${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS
|
||||
"${CMAKE_EXE_LINKER_FLAGS} -Wl,-headerpad_max_install_names -mtune=generic"
|
||||
"${CMAKE_EXE_LINKER_FLAGS} -Wl,-headerpad_max_install_names -mtune=generic -framework Foundation"
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -304,7 +304,7 @@ endif()
|
||||
if(NOT DEFINED CREDITSDIR)
|
||||
if(BUILD_BUNDLE)
|
||||
if(APPLE)
|
||||
set(CREDITSDIR "${DATADIR}")
|
||||
set(CREDITSDIR "${DATADIR}/..")
|
||||
else()
|
||||
set(CREDITSDIR "${DATADIR}")
|
||||
endif()
|
||||
@@ -371,6 +371,8 @@ if(NOT APPLE)
|
||||
if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}")
|
||||
set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}")
|
||||
endif()
|
||||
else()
|
||||
set(LENSFUNDBDIR "${LENSFUNDBDIR}")
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
@@ -387,11 +389,11 @@ if(APPLE)
|
||||
if("${LOCAL_PREFIX}")
|
||||
set(LOCAL_PREFIX
|
||||
"${LOCAL_PREFIX}"
|
||||
CACHE STRING "macos/gtk parent directory ie /usr or /opt")
|
||||
CACHE STRING "macos/gtk parent directory ie /usr/local or /opt/local or /opt/homebrew (for arm64)")
|
||||
else()
|
||||
set(LOCAL_PREFIX
|
||||
/usr
|
||||
CACHE STRING "macos/gtk parent directory ie /usr or /opt")
|
||||
/usr/local
|
||||
CACHE STRING "macos/gtk parent directory ie /usr/local (default) or /opt/local (macports) or /opt/homebrew (for arm64)")
|
||||
endif()
|
||||
if("${FANCY_DMG}")
|
||||
set(FANCY_DMG
|
||||
@@ -686,11 +688,18 @@ elseif(APPLE)
|
||||
${CMAKE_COMMAND}
|
||||
-DPROJECT_SOURCE_DIR:STRING=${PROJECT_SOURCE_DIR}
|
||||
-DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
|
||||
-P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake
|
||||
-DSYSTEM:STRING=Apple
|
||||
-DCXX_FLAGS:STRING=${CXX_FLAGS}
|
||||
-DLFLAGS:STRING=${LFLAGS}
|
||||
-DCOMPILER_INFO:STRING=${COMPILER_INFO})
|
||||
-DCOMPILER_INFO:STRING=${COMPILER_INFO}
|
||||
-DPROC_LABEL:STRING="${PROC_LABEL}"
|
||||
-DPROC_BIT_DEPTH:STRING="${PROC_BIT_DEPTH}"
|
||||
-DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DGTKMM_VERSION:STRING=${GTKMM_VERSION}
|
||||
-DOPTION_OMP:STRING=${OPTION_OMP}
|
||||
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
|
||||
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION}
|
||||
-P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake)
|
||||
else()
|
||||
list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Linux
|
||||
-DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS}
|
||||
|
||||
Reference in New Issue
Block a user