diff options
| author | Yves Starreveld <ystarrev@uwo.ca> | 2003-08-28 00:35:18 (GMT) |
|---|---|---|
| committer | Yves Starreveld <ystarrev@uwo.ca> | 2003-08-28 00:35:18 (GMT) |
| commit | 2ff4690192d6df4c383bb1b8e4505381ce51bcbd (patch) | |
| tree | 6f50d8c138bcfef9f083f2a1b033e064ae646f8b | |
| parent | 44429c46c070d8773e950167ca57c66547968cce (diff) | |
| download | CMake-2ff4690192d6df4c383bb1b8e4505381ce51bcbd.zip CMake-2ff4690192d6df4c383bb1b8e4505381ce51bcbd.tar.gz CMake-2ff4690192d6df4c383bb1b8e4505381ce51bcbd.tar.bz2 | |
ENH: remove the -flat_namespace and -undefined suppress hacks from
ENH: CMAKE_SHARED_MODULE_CREATE_C_FLAGS
ENH: and fix the complex example to specify a -bundle loader for the
ENH: shared module that it builds.
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 2 | ||||
| -rw-r--r-- | Tests/Complex/Library/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Library/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Library/CMakeLists.txt | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 0470828..9ccf817 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -5,7 +5,7 @@ SET(CMAKE_SHARED_MODULE_SUFFIX ".so") SET(CMAKE_MODULE_EXISTS 1) SET(CMAKE_DL_LIBS "") SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib") -SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -flat_namespace -undefined suppress") +SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle") SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index 488f4e7..c4e799e 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -46,6 +46,9 @@ ADD_LIBRARY(CMakeTestCLibraryShared SHARED testConly.c) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +IF(APPLE) + SET_TARGET_PROPERTIES(CMakeTestModule PROPERTIES LINK_FLAGS "-bundle_loader ${Complex_BINARY_DIR}/bin/create_file") +ENDIF(APPLE) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") MESSAGE(SEND_ERROR "SET_TARGET_PROPERTIES or GET_TARGET_PROPERTY failed, FOO_BAR_VAR should be BAR, but is ${FOO_BAR_VAR}") diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index 488f4e7..c4e799e 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -46,6 +46,9 @@ ADD_LIBRARY(CMakeTestCLibraryShared SHARED testConly.c) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +IF(APPLE) + SET_TARGET_PROPERTIES(CMakeTestModule PROPERTIES LINK_FLAGS "-bundle_loader ${Complex_BINARY_DIR}/bin/create_file") +ENDIF(APPLE) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") MESSAGE(SEND_ERROR "SET_TARGET_PROPERTIES or GET_TARGET_PROPERTY failed, FOO_BAR_VAR should be BAR, but is ${FOO_BAR_VAR}") diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt index 488f4e7..c4e799e 100644 --- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt @@ -46,6 +46,9 @@ ADD_LIBRARY(CMakeTestCLibraryShared SHARED testConly.c) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +IF(APPLE) + SET_TARGET_PROPERTIES(CMakeTestModule PROPERTIES LINK_FLAGS "-bundle_loader ${Complex_BINARY_DIR}/bin/create_file") +ENDIF(APPLE) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") MESSAGE(SEND_ERROR "SET_TARGET_PROPERTIES or GET_TARGET_PROPERTY failed, FOO_BAR_VAR should be BAR, but is ${FOO_BAR_VAR}") |