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

BUG: Install rule should take build configuration into account.

Browse Source
This commit is contained in:
Brad King 2005-08-19 17:56:26 -04:00
parent c69c9e0134
commit 98e5119664
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/SimpleInstall/CMakeLists.txt
View File

@ -23,6 +23,11 @@ IF(STAGE2)
SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin") SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin")
ENDIF(CYGWIN OR MINGW) ENDIF(CYGWIN OR MINGW)
MESSAGE("Search for library in: ${LIBPATHS}") 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 FIND_LIBRARY(TEST1_LIBRARY
NAMES ${t1NAMES} NAMES ${t1NAMES}
PATHS ${LIBPATHS} PATHS ${LIBPATHS}
@ -75,11 +80,18 @@ ELSE(STAGE2)
SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3) SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3)
ENDIF(STAGE2) 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( ADD_CUSTOM_COMMAND(
TARGET ${install_target} TARGET ${install_target}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_CTEST_COMMAND} COMMAND ${CMAKE_CTEST_COMMAND}
ARGS --build-and-test ARGS ${SI_CONFIG}
--build-and-test
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}

14
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -23,6 +23,11 @@ IF(STAGE2)
SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin") SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin")
ENDIF(CYGWIN OR MINGW) ENDIF(CYGWIN OR MINGW)
MESSAGE("Search for library in: ${LIBPATHS}") 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 FIND_LIBRARY(TEST1_LIBRARY
NAMES ${t1NAMES} NAMES ${t1NAMES}
PATHS ${LIBPATHS} PATHS ${LIBPATHS}
@ -75,11 +80,18 @@ ELSE(STAGE2)
SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3) SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3)
ENDIF(STAGE2) 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( ADD_CUSTOM_COMMAND(
TARGET ${install_target} TARGET ${install_target}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_CTEST_COMMAND} COMMAND ${CMAKE_CTEST_COMMAND}
ARGS --build-and-test ARGS ${SI_CONFIG}
--build-and-test
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}