kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'osx-search-paths' 

6190415 OS X: Mark find_program results as advanced
d9edf46 OS X: Use correct extra path when searching for applicaton bundles (#13066)
98b9a7f OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)
This commit is contained in:
David Cole 2012-04-10 15:19:31 -04:00 committed by CMake Topic Stage
parent 082fba0662 6190415436
commit 104f7cc00a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/Platform/Darwin.cmake
View File

@ -56,6 +56,7 @@ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex # hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL install_name_tool) FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL install_name_tool)
MARK_AS_ADVANCED(CMAKE_INSTALL_NAME_TOOL)
ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
# Set the assumed (Pre 10.5 or Default) location of the developer tools # Set the assumed (Pre 10.5 or Default) location of the developer tools
@ -63,6 +64,7 @@ SET(OSX_DEVELOPER_ROOT "/Developer")
# Use the xcode-select tool if it's available (Xcode >= 3.0 installations) # Use the xcode-select tool if it's available (Xcode >= 3.0 installations)
FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select) FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
MARK_AS_ADVANCED(CMAKE_XCODE_SELECT)
IF(CMAKE_XCODE_SELECT) IF(CMAKE_XCODE_SELECT)
EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path" EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
OUTPUT_VARIABLE OSX_DEVELOPER_ROOT OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
@ -239,10 +241,22 @@ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
# default to searching for application bundles first # default to searching for application bundles first
SET(CMAKE_FIND_APPBUNDLE FIRST) SET(CMAKE_FIND_APPBUNDLE FIRST)
# set up the default search directories for application bundles # set up the default search directories for application bundles
SET(_apps_paths)
FOREACH(_path
"~/Applications"
"/Applications"
"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
"${OSX_DEVELOPER_ROOT}/Applications" # pre-4.3
)
GET_FILENAME_COMPONENT(_apps "${_path}" ABSOLUTE)
IF(EXISTS "${_apps}")
LIST(APPEND _apps_paths "${_apps}")
ENDIF()
ENDFOREACH()
LIST(REMOVE_DUPLICATES _apps_paths)
SET(CMAKE_SYSTEM_APPBUNDLE_PATH SET(CMAKE_SYSTEM_APPBUNDLE_PATH
~/Applications ${_apps_paths})
/Applications UNSET(_apps_paths)
/Developer/Applications)
INCLUDE(Platform/UnixPaths) INCLUDE(Platform/UnixPaths)
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH