Przeglądaj źródła

ENH: fix for apple

Bill Hoffman 21 lat temu
rodzic
commit
51cb75d454
2 zmienionych plików z 10 dodań i 1 usunięć
  1. 1 0
      Source/CMakeLists.txt
  2. 9 1
      Tests/Jump/Library/Shared/CMakeLists.txt

+ 1 - 0
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}

+ 9 - 1
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)