liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS build fixes suggestions take 2

Browse Source 
Suggestion for resolving
CMakeLists.txt , macosx_bundle.sh , executable_loader.in
Please review + double-check on macOS
This commit is contained in:
ion12
2017-04-18 00:26:28 +01:00
parent 68271a513b
commit c562385f15
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@@ -203,20 +203,31 @@ endif()
if(NOT DEFINED DESKTOPDIR)
if(UNIX)
set(DESKTOPDIR "${CMAKE_INSTALL_PREFIX}/share/applications") # Absolute
#set(DESKTOPDIR "${DATADIR}/share/applications") # Relative
if(BUILD_BUNDLE)
set(DESKTOPDIR "${DATADIR}/share/applications")
else()
set(DESKTOPDIR "${CMAKE_INSTALL_PREFIX}/share/applications")
endif()
endif()
endif()
if(NOT DEFINED ICONSDIR)
if(UNIX)
set(ICONSDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
if(BUILD_BUNDLE)
set(ICONSDIR "${DATADIR}/share/icons")
else()
set(ICONSDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
endif()
endif()
endif()
if(NOT DEFINED APPDATADIR)
if(UNIX)
set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
if(BUILD_BUNDLE)
set(APPDATADIR "${DATADIR}/share/appdata")
else()
set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
endif()
endif()
endif()
@@ -421,7 +432,9 @@ install(FILES RELEASE_NOTES.txt DESTINATION "${CREDITSDIR}" OPTIONAL)
# The standard location for man pages in Linux is /usr/share/man
# Use "manpath" to see the search paths for man pages on your system.
if(UNIX OR WIN32)
if(BUILD_BUNDLE)
install(FILES "${PROJECT_SOURCE_DIR}/doc/manpage/rawtherapee.1" DESTINATION "${DATADIR}/share/man/man1")
else()
install(FILES "${PROJECT_SOURCE_DIR}/doc/manpage/rawtherapee.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
endif()
@@ -437,4 +450,3 @@ add_subdirectory(rtexif)
add_subdirectory(rtengine)
add_subdirectory(rtgui)
add_subdirectory(rtdata)