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

COMP: Rename the executables for the SimpleInstall tests so that the executable files that run during the test do not have the word install in their file names. This allows running the tests on Windows Vista without admin privileges and without adding a manifest containing the asInvoker requestedExecutionLevel element.

This commit is contained in:
David Cole 2007-10-01 15:57:34 -04:00
parent e6d45a2cf5
commit 890efa7980
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/CMakeLists.txt
View File

@ -182,7 +182,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
--build-two-config --build-two-config
--build-options --build-options
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallExe) --test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExe)
ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND} ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/SimpleInstallS2" "${CMake_SOURCE_DIR}/Tests/SimpleInstallS2"
@ -194,7 +194,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
--build-options --build-options
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
"-DSTAGE2:BOOL=1" "-DSTAGE2:BOOL=1"
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallS2) --test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExeS2)
ADD_TEST(X11 ${CMAKE_CTEST_COMMAND} ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test

12
Tests/SimpleInstall/CMakeLists.txt
View File

@ -65,9 +65,9 @@ IF(STAGE2)
DOC "Fourth library") DOC "Fourth library")
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include) INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include)
ADD_EXECUTABLE (SimpleInstallS2 inst2.cxx foo.c foo.h) ADD_EXECUTABLE (SimpleInstExeS2 inst2.cxx foo.c foo.h)
TARGET_LINK_LIBRARIES(SimpleInstallS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} ${TEST4_LIBRARY}) TARGET_LINK_LIBRARIES(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} ${TEST4_LIBRARY})
SET(install_target SimpleInstallS2) SET(install_target SimpleInstExeS2)
IF("${TEST1_LIBRARY}" MATCHES "static") IF("${TEST1_LIBRARY}" MATCHES "static")
MESSAGE(STATUS "test1 correctly found in lib/static") MESSAGE(STATUS "test1 correctly found in lib/static")
@ -130,10 +130,10 @@ IF(STAGE2)
ENDIF(EMPTY_FILES) ENDIF(EMPTY_FILES)
# Make sure the test executable can run from the install tree. # Make sure the test executable can run from the install tree.
SET_TARGET_PROPERTIES(SimpleInstallS2 PROPERTIES SET_TARGET_PROPERTIES(SimpleInstExeS2 PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib) INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
INSTALL_TARGETS(/MyTest/bin SimpleInstallS2) INSTALL_TARGETS(/MyTest/bin SimpleInstExeS2)
# try to import the exported targets again # try to import the exported targets again
SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib) SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
@ -260,7 +260,7 @@ ELSE(STAGE2)
SET_DIRECTORY_PROPERTIES(PROPERTIES SET_DIRECTORY_PROPERTIES(PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake) ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstallExe) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe)
# Disable VERSION test until it is implemented in the XCode generator. # Disable VERSION test until it is implemented in the XCode generator.
IF(NOT XCODE) IF(NOT XCODE)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2)

12
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -65,9 +65,9 @@ IF(STAGE2)
DOC "Fourth library") DOC "Fourth library")
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include) INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include)
ADD_EXECUTABLE (SimpleInstallS2 inst2.cxx foo.c foo.h) ADD_EXECUTABLE (SimpleInstExeS2 inst2.cxx foo.c foo.h)
TARGET_LINK_LIBRARIES(SimpleInstallS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} ${TEST4_LIBRARY}) TARGET_LINK_LIBRARIES(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} ${TEST4_LIBRARY})
SET(install_target SimpleInstallS2) SET(install_target SimpleInstExeS2)
IF("${TEST1_LIBRARY}" MATCHES "static") IF("${TEST1_LIBRARY}" MATCHES "static")
MESSAGE(STATUS "test1 correctly found in lib/static") MESSAGE(STATUS "test1 correctly found in lib/static")
@ -130,10 +130,10 @@ IF(STAGE2)
ENDIF(EMPTY_FILES) ENDIF(EMPTY_FILES)
# Make sure the test executable can run from the install tree. # Make sure the test executable can run from the install tree.
SET_TARGET_PROPERTIES(SimpleInstallS2 PROPERTIES SET_TARGET_PROPERTIES(SimpleInstExeS2 PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib) INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
INSTALL_TARGETS(/MyTest/bin SimpleInstallS2) INSTALL_TARGETS(/MyTest/bin SimpleInstExeS2)
# try to import the exported targets again # try to import the exported targets again
SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib) SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
@ -260,7 +260,7 @@ ELSE(STAGE2)
SET_DIRECTORY_PROPERTIES(PROPERTIES SET_DIRECTORY_PROPERTIES(PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake) ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstallExe) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe)
# Disable VERSION test until it is implemented in the XCode generator. # Disable VERSION test until it is implemented in the XCode generator.
IF(NOT XCODE) IF(NOT XCODE)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2)