Browse Source

ENH: Improved test to have a different relative path name for libraries between the Executable and Library directories.

Brad King 22 years ago
parent
commit
a4aab3b677

+ 1 - 19
Tests/Jump/Library/CMakeLists.txt

@@ -1,19 +1 @@
-ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx)
-ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
-
-IF(WIN32)
-  SET(LIB_NAME
-    ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
-  SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
-  IF(EXECUTABLE_OUTPUT_PATH)
-    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
-  ENDIF(EXECUTABLE_OUTPUT_PATH)
-  SET(LIB_DIR ${Jump_BINARY_DIR}/Library)
-  IF(LIBRARY_OUTPUT_PATH)
-    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
-  ENDIF(LIBRARY_OUTPUT_PATH)
-  ADD_CUSTOM_COMMAND(TARGET jumpShared
-    POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
-    ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
-    ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
-ENDIF(WIN32)
+SUBDIRS(Static Shared)

+ 18 - 0
Tests/Jump/Library/Shared/CMakeLists.txt

@@ -0,0 +1,18 @@
+ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
+
+IF(WIN32)
+  SET(LIB_NAME
+    ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
+  SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
+  IF(EXECUTABLE_OUTPUT_PATH)
+    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF(EXECUTABLE_OUTPUT_PATH)
+  SET(LIB_DIR ${Jump_BINARY_DIR}/Library)
+  IF(LIBRARY_OUTPUT_PATH)
+    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
+  ENDIF(LIBRARY_OUTPUT_PATH)
+  ADD_CUSTOM_COMMAND(TARGET jumpShared
+    POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
+    ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
+    ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
+ENDIF(WIN32)

+ 0 - 0
Tests/Jump/Library/jumpShared.cxx → Tests/Jump/Library/Shared/jumpShared.cxx


+ 1 - 0
Tests/Jump/Library/Static/CMakeLists.txt

@@ -0,0 +1 @@
+ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx)

+ 0 - 0
Tests/Jump/Library/jumpStatic.cxx → Tests/Jump/Library/Static/jumpStatic.cxx