diff options
| author | Brad King <brad.king@kitware.com> | 2004-01-22 15:51:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2004-01-22 15:51:34 (GMT) |
| commit | a4aab3b677b01a8049cdd41bc168deed69f437fa (patch) | |
| tree | c9d50384a9aff7c97957e01978a87a42efd05d68 /Tests | |
| parent | 778af637eab4716e3635a09988dd3c2fb582497f (diff) | |
| download | CMake-a4aab3b677b01a8049cdd41bc168deed69f437fa.zip CMake-a4aab3b677b01a8049cdd41bc168deed69f437fa.tar.gz CMake-a4aab3b677b01a8049cdd41bc168deed69f437fa.tar.bz2 | |
ENH: Improved test to have a different relative path name for libraries between the Executable and Library directories.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Jump/Library/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | Tests/Jump/Library/Shared/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Tests/Jump/Library/Shared/jumpShared.cxx (renamed from Tests/Jump/Library/jumpShared.cxx) | 0 | ||||
| -rw-r--r-- | Tests/Jump/Library/Static/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/Jump/Library/Static/jumpStatic.cxx (renamed from Tests/Jump/Library/jumpStatic.cxx) | 0 |
5 files changed, 20 insertions, 19 deletions
diff --git a/Tests/Jump/Library/CMakeLists.txt b/Tests/Jump/Library/CMakeLists.txt index fce9c20..9d45ea4 100644 --- a/Tests/Jump/Library/CMakeLists.txt +++ b/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) diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt new file mode 100644 index 0000000..f0e09af --- /dev/null +++ b/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) diff --git a/Tests/Jump/Library/jumpShared.cxx b/Tests/Jump/Library/Shared/jumpShared.cxx index f500058..f500058 100644 --- a/Tests/Jump/Library/jumpShared.cxx +++ b/Tests/Jump/Library/Shared/jumpShared.cxx diff --git a/Tests/Jump/Library/Static/CMakeLists.txt b/Tests/Jump/Library/Static/CMakeLists.txt new file mode 100644 index 0000000..23e70c0 --- /dev/null +++ b/Tests/Jump/Library/Static/CMakeLists.txt @@ -0,0 +1 @@ +ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx) diff --git a/Tests/Jump/Library/jumpStatic.cxx b/Tests/Jump/Library/Static/jumpStatic.cxx index 1f92eb9..1f92eb9 100644 --- a/Tests/Jump/Library/jumpStatic.cxx +++ b/Tests/Jump/Library/Static/jumpStatic.cxx |