summaryrefslogtreecommitdiff
path: root/Tests/SimpleInstallS2/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-08-19 17:56:26 -0400
committerBrad King <brad.king@kitware.com>2005-08-19 17:56:26 -0400
commit98e51196642d384336b08461ca56eb7c651a9eb0 (patch)
tree546dbb05935fdf0c35d5e31e70b3df0f2d447253 /Tests/SimpleInstallS2/CMakeLists.txt
parentc69c9e0134aa41df5c8def0c0d9d8878d0ae1cdc (diff)
downloadcmake-98e51196642d384336b08461ca56eb7c651a9eb0.tar.gz
BUG: Install rule should take build configuration into account.
Diffstat (limited to 'Tests/SimpleInstallS2/CMakeLists.txt')
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt
index f41338538e..411aa97a2b 100644
--- a/Tests/SimpleInstallS2/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/CMakeLists.txt
@@ -23,6 +23,11 @@ IF(STAGE2)
SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin")
ENDIF(CYGWIN OR MINGW)
MESSAGE("Search for library in: ${LIBPATHS}")
+
+ SET(TEST1_LIBRARY "TEST1_LIBRARY-NOTFOUND" CACHE FILEPATH "Force find." FORCE)
+ SET(TEST2_LIBRARY "TEST2_LIBRARY-NOTFOUND" CACHE FILEPATH "Force find." FORCE)
+ SET(TEST4_LIBRARY "TEST4_LIBRARY-NOTFOUND" CACHE FILEPATH "Force find." FORCE)
+
FIND_LIBRARY(TEST1_LIBRARY
NAMES ${t1NAMES}
PATHS ${LIBPATHS}
@@ -75,11 +80,18 @@ ELSE(STAGE2)
SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3)
ENDIF(STAGE2)
+IF(CMAKE_CONFIGURATION_TYPES)
+ SET(SI_CONFIG -C ${CMAKE_CFG_INTDIR})
+ELSE(CMAKE_CONFIGURATION_TYPES)
+ SET(SI_CONFIG)
+ENDIF(CMAKE_CONFIGURATION_TYPES)
+
ADD_CUSTOM_COMMAND(
TARGET ${install_target}
POST_BUILD
COMMAND ${CMAKE_CTEST_COMMAND}
- ARGS --build-and-test
+ ARGS ${SI_CONFIG}
+ --build-and-test
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
--build-generator ${CMAKE_GENERATOR}