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

ENH: fix for apple

This commit is contained in:
Bill Hoffman 2004-04-02 09:43:35 -05:00
parent 7099db8d58
commit 51cb75d454
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CMakeLists.txt
View File

@ -502,6 +502,7 @@ IF(BUILD_TESTING)
"${CMake_SOURCE_DIR}/Tests/Jump" "${CMake_SOURCE_DIR}/Tests/Jump"
"${CMake_BINARY_DIR}/Tests/Jump/NoLibOut" "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut"
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
--build-run-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
--build-project Jump --build-project Jump
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${MAKEPROGRAM} --build-makeprogram ${MAKEPROGRAM}

10
Tests/Jump/Library/Shared/CMakeLists.txt
View File

@ -1,6 +1,14 @@
ADD_LIBRARY(jumpShared SHARED jumpShared.cxx) ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
IF(WIN32) 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 SET(LIB_NAME
${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX}) ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
SET(EXE_DIR ${Jump_BINARY_DIR}/Executable) SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
@ -15,4 +23,4 @@ IF(WIN32)
POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME} ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}) ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
ENDIF(WIN32) ENDIF(SHARED_MUST_BE_IN_EXE_DIR)