diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-02 14:43:35 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-02 14:43:35 (GMT) |
| commit | 51cb75d454bd95d67179594fbe0fd9c9baaf2e7b (patch) | |
| tree | 8ee817297739fa354c776ba325d4fd5a130d2013 | |
| parent | 7099db8d5811fae4273d5404d61fa580902ee7c3 (diff) | |
| download | CMake-51cb75d454bd95d67179594fbe0fd9c9baaf2e7b.zip CMake-51cb75d454bd95d67179594fbe0fd9c9baaf2e7b.tar.gz CMake-51cb75d454bd95d67179594fbe0fd9c9baaf2e7b.tar.bz2 | |
ENH: fix for apple
| -rw-r--r-- | Source/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/Jump/Library/Shared/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 310e38a..3ba2ff1 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -502,6 +502,7 @@ IF(BUILD_TESTING) "${CMake_SOURCE_DIR}/Tests/Jump" "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable" + --build-run-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable" --build-project Jump --build-generator ${CMAKE_GENERATOR} --build-makeprogram ${MAKEPROGRAM} diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt index f020446..46d4d36 100644 --- a/Tests/Jump/Library/Shared/CMakeLists.txt +++ b/Tests/Jump/Library/Shared/CMakeLists.txt @@ -1,6 +1,14 @@ ADD_LIBRARY(jumpShared SHARED jumpShared.cxx) IF(WIN32) + SET(SHARED_MUST_BE_IN_EXE_DIR 1) +ENDIF(WIN32) + +IF(APPLE) + SET(SHARED_MUST_BE_IN_EXE_DIR 1) +ENDIF(APPLE) + +IF(SHARED_MUST_BE_IN_EXE_DIR) SET(LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX}) SET(EXE_DIR ${Jump_BINARY_DIR}/Executable) @@ -15,4 +23,4 @@ IF(WIN32) POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME} ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}) -ENDIF(WIN32) +ENDIF(SHARED_MUST_BE_IN_EXE_DIR) |