summaryrefslogtreecommitdiff
path: root/Tests/SimpleInstallS2
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/SimpleInstallS2')
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt414
-rw-r--r--Tests/SimpleInstallS2/InstallScript1.cmake10
-rw-r--r--Tests/SimpleInstallS2/InstallScript2.cmake26
-rw-r--r--Tests/SimpleInstallS2/InstallScript3.cmake22
-rw-r--r--Tests/SimpleInstallS2/InstallScript4.cmake38
-rw-r--r--Tests/SimpleInstallS2/PackageScript.cmake14
-rw-r--r--Tests/SimpleInstallS2/PostInstall.cmake12
-rw-r--r--Tests/SimpleInstallS2/PreInstall.cmake4
-rw-r--r--Tests/SimpleInstallS2/TestSubDir/CMakeLists.txt6
-rw-r--r--Tests/SimpleInstallS2/lib2.h2
-rw-r--r--Tests/SimpleInstallS2/lib3.h2
-rw-r--r--Tests/SimpleInstallS2/lib4.h2
-rw-r--r--Tests/SimpleInstallS2/scripts/CMakeLists.txt2
13 files changed, 277 insertions, 277 deletions
diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt
index 378b529..479d6ec 100644
--- a/Tests/SimpleInstallS2/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/CMakeLists.txt
@@ -1,216 +1,216 @@
cmake_minimum_required (VERSION 2.6)
-PROJECT (TestSimpleInstall)
-SET(CMAKE_VERBOSE_MAKEFILE 1)
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY
+project (TestSimpleInstall)
+set(CMAKE_VERBOSE_MAKEFILE 1)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
"${TestSimpleInstall_BINARY_DIR}/bin")
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
"${TestSimpleInstall_BINARY_DIR}/lib/static")
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
"${TestSimpleInstall_BINARY_DIR}/lib")
# Skip generating the rpath pointing at the build tree to make sure
# the executable is installed with the proper rpath in the install
# tree.
-SET(CMAKE_SKIP_BUILD_RPATH 1)
+set(CMAKE_SKIP_BUILD_RPATH 1)
# Make sure the executable can run from the install tree.
-SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
+set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
# Skip the dependency that causes a build when installing. This
# avoids infinite loops when the post-build rule below installs.
-SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
-SET(CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY 1)
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
+set(CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY 1)
-SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
+set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-SET(EXTRA_INSTALL_FLAGS)
-MESSAGE("Extra install: ${EXTRA_INSTALL_FLAGS}")
+set(EXTRA_INSTALL_FLAGS)
+message("Extra install: ${EXTRA_INSTALL_FLAGS}")
-IF(STAGE2)
- SET(LIBPATHS
+if(STAGE2)
+ set(LIBPATHS
${CMAKE_INSTALL_PREFIX}/MyTest/lib/static
${CMAKE_INSTALL_PREFIX}/MyTest/lib
)
- SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX} test1rel)
- SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
- SET(t4NAMES test4out test4out${CMAKE_DEBUG_POSTFIX})
+ set(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX} test1rel)
+ set(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
+ set(t4NAMES test4out test4out${CMAKE_DEBUG_POSTFIX})
# Make sure the install script ran.
- SET(CMAKE_INSTALL_SCRIPT_DID_RUN 0)
- INCLUDE(${CMAKE_INSTALL_PREFIX}/MyTest/InstallScriptOut.cmake OPTIONAL)
- IF(CMAKE_INSTALL_SCRIPT_DID_RUN)
- MESSAGE(STATUS "Stage 1 did run install script 2.")
- ELSE(CMAKE_INSTALL_SCRIPT_DID_RUN)
- MESSAGE(SEND_ERROR "Stage 1 did not run install script 2.")
- ENDIF(CMAKE_INSTALL_SCRIPT_DID_RUN)
-
- IF(CYGWIN OR MINGW)
- SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/MyTest/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
+ set(CMAKE_INSTALL_SCRIPT_DID_RUN 0)
+ include(${CMAKE_INSTALL_PREFIX}/MyTest/InstallScriptOut.cmake OPTIONAL)
+ if(CMAKE_INSTALL_SCRIPT_DID_RUN)
+ message(STATUS "Stage 1 did run install script 2.")
+ else()
+ message(SEND_ERROR "Stage 1 did not run install script 2.")
+ endif()
+
+ if(CYGWIN OR MINGW)
+ set(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/MyTest/bin")
+ endif()
+ 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}
DOC "First library")
- FIND_LIBRARY(TEST2_LIBRARY
+ find_library(TEST2_LIBRARY
NAMES ${t2NAMES}
PATHS ${LIBPATHS}
DOC "Second library")
- FIND_LIBRARY(TEST4_LIBRARY
+ find_library(TEST4_LIBRARY
NAMES ${t4NAMES}
PATHS ${LIBPATHS}
DOC "Fourth library")
# Test importing a library found on disk.
- ADD_LIBRARY(lib_test4 UNKNOWN IMPORTED)
- SET_PROPERTY(TARGET lib_test4 PROPERTY IMPORTED_LOCATION ${TEST4_LIBRARY})
+ add_library(lib_test4 UNKNOWN IMPORTED)
+ set_property(TARGET lib_test4 PROPERTY IMPORTED_LOCATION ${TEST4_LIBRARY})
- INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include)
- ADD_EXECUTABLE (SimpleInstExeS2 inst2.cxx foo.c foo.h)
- TARGET_LINK_LIBRARIES(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} lib_test4)
- SET(install_target SimpleInstExeS2)
+ include_directories(${CMAKE_INSTALL_PREFIX}/MyTest/include)
+ add_executable (SimpleInstExeS2 inst2.cxx foo.c foo.h)
+ target_link_libraries(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} lib_test4)
+ set(install_target SimpleInstExeS2)
- IF("${TEST1_LIBRARY}" MATCHES "static")
- MESSAGE(STATUS "test1 correctly found in lib/static")
- ELSE("${TEST1_LIBRARY}" MATCHES "static")
- MESSAGE(SEND_ERROR "test1 not found in lib/static!")
- ENDIF("${TEST1_LIBRARY}" MATCHES "static")
+ if("${TEST1_LIBRARY}" MATCHES "static")
+ message(STATUS "test1 correctly found in lib/static")
+ else()
+ message(SEND_ERROR "test1 not found in lib/static!")
+ endif()
# Check for failure of configuration-specific installation.
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Release/lib1debug.h")
- MESSAGE(FATAL_ERROR "Debug-configuration file installed for Release!")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Release/lib1debug.h")
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Debug/lib1release.h")
- MESSAGE(FATAL_ERROR "Release-configuration file installed for Debug!")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Debug/lib1release.h")
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Release/lib1debug.h")
+ message(FATAL_ERROR "Debug-configuration file installed for Release!")
+ endif()
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Debug/lib1release.h")
+ message(FATAL_ERROR "Release-configuration file installed for Debug!")
+ endif()
# Check for failure of directory installation.
- IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
- MESSAGE(FATAL_ERROR "Directory installation did not install TSD.h")
- ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
- MESSAGE(FATAL_ERROR "Directory installation installed CVS directory.")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
- MESSAGE(FATAL_ERROR "Directory installation installed CVS directory.")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CMakeLists.txt")
- MESSAGE(FATAL_ERROR "Directory installation installed CMakeLists.txt.")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CMakeLists.txt")
- IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.h")
- MESSAGE(FATAL_ERROR "Directory installation did not install alternate TSD.h")
- ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.h")
- IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.cxx")
- MESSAGE(FATAL_ERROR "Directory installation installed alternate TSD.cxx")
- ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.cxx")
+ if(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
+ message(FATAL_ERROR "Directory installation did not install TSD.h")
+ endif()
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
+ message(FATAL_ERROR "Directory installation installed CVS directory.")
+ endif()
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
+ message(FATAL_ERROR "Directory installation installed CVS directory.")
+ endif()
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CMakeLists.txt")
+ message(FATAL_ERROR "Directory installation installed CMakeLists.txt.")
+ endif()
+ if(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.h")
+ message(FATAL_ERROR "Directory installation did not install alternate TSD.h")
+ endif()
+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.cxx")
+ message(FATAL_ERROR "Directory installation installed alternate TSD.cxx")
+ endif()
# Check that scripts properly installed.
- IF(WIN32 AND NOT CYGWIN)
- SET(BAT .bat)
- ELSE(WIN32 AND NOT CYGWIN)
- SET(BAT)
- ENDIF(WIN32 AND NOT CYGWIN)
- FOREACH(loc share share/old1 share/old2 share/old3 share/alt)
- SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
- EXECUTE_PROCESS(
+ if(WIN32 AND NOT CYGWIN)
+ set(BAT .bat)
+ else()
+ set(BAT)
+ endif()
+ foreach(loc share share/old1 share/old2 share/old3 share/alt)
+ set(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
+ execute_process(
COMMAND ${CUR_SCRIPT}
RESULT_VARIABLE SAMPLE_SCRIPT_RESULT
OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT
)
- IF(NOT "${SAMPLE_SCRIPT_RESULT}" MATCHES "^0$")
- MESSAGE(FATAL_ERROR
+ if(NOT "${SAMPLE_SCRIPT_RESULT}" MATCHES "^0$")
+ message(FATAL_ERROR
"Sample script [${CUR_SCRIPT}] failed: [${SAMPLE_SCRIPT_RESULT}]")
- ENDIF(NOT "${SAMPLE_SCRIPT_RESULT}" MATCHES "^0$")
- IF(NOT "${SAMPLE_SCRIPT_OUTPUT}" MATCHES "Sample Script Output")
- MESSAGE(FATAL_ERROR
+ endif()
+ if(NOT "${SAMPLE_SCRIPT_OUTPUT}" MATCHES "Sample Script Output")
+ message(FATAL_ERROR
"Bad sample script [${CUR_SCRIPT}] output: [${SAMPLE_SCRIPT_OUTPUT}]")
- ENDIF(NOT "${SAMPLE_SCRIPT_OUTPUT}" MATCHES "Sample Script Output")
- ENDFOREACH(loc)
+ endif()
+ endforeach()
# Check for failure of empty directory installation.
- IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/empty")
- MESSAGE(FATAL_ERROR "Empty directory installation did not install.")
- ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/empty")
- FILE(GLOB EMPTY_FILES "${CMAKE_INSTALL_PREFIX}/MyTest/share/empty/*")
- IF(EMPTY_FILES)
- MESSAGE(FATAL_ERROR "Empty directory installed [${EMPTY_FILES}].")
- ENDIF(EMPTY_FILES)
+ if(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/empty")
+ message(FATAL_ERROR "Empty directory installation did not install.")
+ endif()
+ file(GLOB EMPTY_FILES "${CMAKE_INSTALL_PREFIX}/MyTest/share/empty/*")
+ if(EMPTY_FILES)
+ message(FATAL_ERROR "Empty directory installed [${EMPTY_FILES}].")
+ endif()
# Make sure the test executable can run from the install tree.
- SET_TARGET_PROPERTIES(SimpleInstExeS2 PROPERTIES
+ set_target_properties(SimpleInstExeS2 PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
- INSTALL_TARGETS(/MyTest/bin SimpleInstExeS2)
+ install_targets(/MyTest/bin SimpleInstExeS2)
# try to import the exported targets again
- SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
- FIND_PACKAGE(SimpleInstallS1 REQUIRED)
- GET_TARGET_PROPERTY(simpleInstallImported S1_SimpleInstall IMPORTED)
- IF(NOT simpleInstallImported)
- MESSAGE(FATAL_ERROR "Target S1_SimpleInstall could not be imported")
- ENDIF(NOT simpleInstallImported)
-
-ELSE(STAGE2)
+ set(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
+ find_package(SimpleInstallS1 REQUIRED)
+ get_target_property(simpleInstallImported S1_SimpleInstall IMPORTED)
+ if(NOT simpleInstallImported)
+ message(FATAL_ERROR "Target S1_SimpleInstall could not be imported")
+ endif()
+
+else()
# Wipe out the install directory to do a fresh test.
- FILE(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/MyTest)
+ file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/MyTest)
# this is stage 1, so create libraries and modules and install everything
- ADD_LIBRARY(test1 STATIC lib1.cxx)
- ADD_LIBRARY(test2 SHARED lib2.cxx)
- ADD_LIBRARY(test3 MODULE lib3.cxx)
- ADD_LIBRARY(test4 SHARED lib4.cxx)
+ add_library(test1 STATIC lib1.cxx)
+ add_library(test2 SHARED lib2.cxx)
+ add_library(test3 MODULE lib3.cxx)
+ add_library(test4 SHARED lib4.cxx)
# Test <ARCHIVE|LIBRARY|RUNTIME>_OUTPUT_NAME properties.
- SET_PROPERTY(TARGET test4 PROPERTY ARCHIVE_OUTPUT_NAME test4out)
- SET_PROPERTY(TARGET test4 PROPERTY LIBRARY_OUTPUT_NAME test4out)
+ set_property(TARGET test4 PROPERTY ARCHIVE_OUTPUT_NAME test4out)
+ set_property(TARGET test4 PROPERTY LIBRARY_OUTPUT_NAME test4out)
- ADD_EXECUTABLE (SimpleInstall inst.cxx foo.c foo.h)
- TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4)
- SET(install_target SimpleInstall)
+ add_executable (SimpleInstall inst.cxx foo.c foo.h)
+ target_link_libraries(SimpleInstall test1 test2 test4)
+ set(install_target SimpleInstall)
- SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe)
+ set_target_properties(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe)
# Disable VERSION test until it is implemented in the Xcode generator.
- IF(NOT XCODE)
- SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2)
- ENDIF(NOT XCODE)
+ if(NOT XCODE)
+ set_target_properties(SimpleInstall PROPERTIES VERSION 1.2)
+ endif()
# Make sure the test executable can run from the install tree.
- SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES
+ set_target_properties(SimpleInstall PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
# Test per-configuration output name.
- SET_TARGET_PROPERTIES(test1 PROPERTIES RELEASE_OUTPUT_NAME test1rel)
- SET_TARGET_PROPERTIES(test2 PROPERTIES PUBLIC_HEADER foo.h)
+ set_target_properties(test1 PROPERTIES RELEASE_OUTPUT_NAME test1rel)
+ set_target_properties(test2 PROPERTIES PUBLIC_HEADER foo.h)
- IF(CMAKE_GENERATOR MATCHES "Makefiles")
- ADD_SUBDIRECTORY(TestSubDir)
- ADD_DEPENDENCIES(SimpleInstall TSD)
- ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
+ if(CMAKE_GENERATOR MATCHES "Makefiles")
+ add_subdirectory(TestSubDir)
+ add_dependencies(SimpleInstall TSD)
+ endif()
- ADD_DEPENDENCIES(SimpleInstall test3)
- ADD_DEPENDENCIES(test2 test3)
- ADD_DEPENDENCIES(test4 test2)
+ add_dependencies(SimpleInstall test3)
+ add_dependencies(test2 test3)
+ add_dependencies(test4 test2)
- INSTALL(TARGETS SimpleInstall test1 test2 test3 EXPORT SimpleInstallS1
+ install(TARGETS SimpleInstall test1 test2 test3 EXPORT SimpleInstallS1
RUNTIME DESTINATION MyTest/bin COMPONENT Runtime # .exe, .dll
LIBRARY DESTINATION MyTest/lib COMPONENT Runtime # .so, mod.dll
ARCHIVE DESTINATION MyTest/lib/static COMPONENT Development # .a, .lib
- PUBLIC_HEADER DESTINATION MyTest/include COMPONENT Development
+ PUBLIC_HEADER DESTINATION MyTest/include COMPONENT Development
)
- INSTALL(TARGETS test4 PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ install(TARGETS test4 PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
RUNTIME DESTINATION MyTest/bin
LIBRARY DESTINATION MyTest/lib
ARCHIVE DESTINATION MyTest/lib/static
OPTIONAL # for coverage...target should always exist
)
- INSTALL(FILES lib1.h DESTINATION MyTest/include/foo)
- INSTALL(FILES lib2.h
+ install(FILES lib1.h DESTINATION MyTest/include/foo)
+ install(FILES lib2.h
DESTINATION MyTest/include/foo
COMPONENT Development
PERMISSIONS OWNER_READ OWNER_WRITE
@@ -218,40 +218,40 @@ ELSE(STAGE2)
)
# Test old-style install commands.
- INSTALL_FILES(/MyTest/include FILES lib3.h)
- INSTALL_FILES(/MyTest/include/old .h lib3)
- INSTALL_FILES(/MyTest/include/old "^lib2.h$")
- INSTALL_PROGRAMS(/MyTest/share/old1 FILES
+ install_files(/MyTest/include FILES lib3.h)
+ install_files(/MyTest/include/old .h lib3)
+ install_files(/MyTest/include/old "^lib2.h$")
+ install_programs(/MyTest/share/old1 FILES
scripts/sample_script scripts/sample_script.bat)
- INSTALL_PROGRAMS(/MyTest/share/old2
+ install_programs(/MyTest/share/old2
scripts/sample_script scripts/sample_script.bat)
# "export" the targets collected in "SimpleInstallS1"
- INSTALL(EXPORT SimpleInstallS1 FILE SimpleInstallS1Config.cmake
- DESTINATION MyTest/lib
+ install(EXPORT SimpleInstallS1 FILE SimpleInstallS1Config.cmake
+ DESTINATION MyTest/lib
NAMESPACE S1_ )
- EXPORT(TARGETS SimpleInstall test1 test2 test3
+ export(TARGETS SimpleInstall test1 test2 test3
FILE "${CMAKE_CURRENT_BINARY_DIR}/SimpleInstallS1Config.cmake"
NAMESPACE S2_ )
- ADD_SUBDIRECTORY(scripts)
+ add_subdirectory(scripts)
# Test optional installation.
- INSTALL(FILES does_not_exist.h DESTINATION MyTest/include/foo OPTIONAL)
+ install(FILES does_not_exist.h DESTINATION MyTest/include/foo OPTIONAL)
# Test configuration-specific installation.
- INSTALL(FILES lib1.h RENAME lib1release.h CONFIGURATIONS Release
+ install(FILES lib1.h RENAME lib1release.h CONFIGURATIONS Release
DESTINATION MyTest/include/Release
)
- INSTALL(FILES lib1.h RENAME lib1debug.h CONFIGURATIONS Debug
+ install(FILES lib1.h RENAME lib1debug.h CONFIGURATIONS Debug
DESTINATION MyTest/include/Debug
)
# Test directory installation.
- FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
- FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
- INSTALL(
+ file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
+ file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
+ install(
DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
FILE_PERMISSIONS OWNER_READ OWNER_WRITE
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
@@ -262,14 +262,14 @@ ELSE(STAGE2)
)
# Alternate directory installation for coverage.
- INSTALL(
+ install(
DIRECTORY scripts/ DESTINATION MyTest/share/alt
COMPONENT Development
USE_SOURCE_PERMISSIONS
PATTERN "CVS" EXCLUDE
REGEX "\\.txt$" EXCLUDE
)
- INSTALL(
+ install(
DIRECTORY TestSubDir DESTINATION MyTest/share/alt
FILE_PERMISSIONS OWNER_READ OWNER_WRITE
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
@@ -278,109 +278,109 @@ ELSE(STAGE2)
)
# Test empty directory installation.
- INSTALL(DIRECTORY DESTINATION MyTest/share/empty)
+ install(DIRECTORY DESTINATION MyTest/share/empty)
# Test optional directory installation.
- INSTALL(DIRECTORY does-not-exist DESTINATION MyTest/share OPTIONAL)
+ install(DIRECTORY does-not-exist DESTINATION MyTest/share OPTIONAL)
# Test user-specified install scripts, with and without COMPONENT.
- INSTALL(
+ install(
SCRIPT InstallScript1.cmake
- CODE "SET(INSTALL_CODE_DID_RUN 1)"
+ CODE "set(INSTALL_CODE_DID_RUN 1)"
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/InstallScript2.cmake
)
- INSTALL(
+ install(
SCRIPT InstallScript3.cmake
- CODE "SET(INSTALL_CODE_WITH_COMPONENT_DID_RUN 1)"
+ CODE "set(INSTALL_CODE_WITH_COMPONENT_DID_RUN 1)"
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/InstallScript4.cmake
COMPONENT Development
)
- SET_DIRECTORY_PROPERTIES(PROPERTIES
+ set_directory_properties(PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES
"${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake;${CMAKE_INSTALL_PREFIX}/InstallScript4Out.cmake")
- SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT
+ set_target_properties(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT
${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake)
- SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT
+ set_target_properties(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT
${CMAKE_CURRENT_SOURCE_DIR}/PostInstall.cmake)
- SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3
+ set_target_properties(test4 PROPERTIES VERSION 1.2 SOVERSION 3
INSTALL_NAME_DIR @executable_path/../lib)
-ENDIF(STAGE2)
+endif()
-IF(CMAKE_CONFIGURATION_TYPES)
- SET(SI_CONFIG -C ${CMAKE_CFG_INTDIR})
-ELSE(CMAKE_CONFIGURATION_TYPES)
- SET(SI_CONFIG)
-ENDIF(CMAKE_CONFIGURATION_TYPES)
+if(CMAKE_CONFIGURATION_TYPES)
+ set(SI_CONFIG -C ${CMAKE_CFG_INTDIR})
+else()
+ set(SI_CONFIG)
+endif()
# Dummy test of CPack
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack")
-SET(CPACK_PACKAGE_VENDOR "Kitware")
-SET(CPACK_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/PackageScript.cmake")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack")
+set(CPACK_PACKAGE_VENDOR "Kitware")
+set(CPACK_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/PackageScript.cmake")
-IF(WIN32 AND NOT UNIX)
- FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis
+if(WIN32 AND NOT UNIX)
+ find_program(NSIS_MAKENSIS NAMES makensis
PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
DOC "Where is makensis.exe located"
)
- IF(NOT NSIS_MAKENSIS)
- SET(CPACK_GENERATOR TGZ)
- ENDIF(NOT NSIS_MAKENSIS)
-ENDIF(WIN32 AND NOT UNIX)
-IF(UNIX AND NOT APPLE)
- SET(CPACK_GENERATOR "TGZ;STGZ;TZ")
- # FIND_PROGRAM(found_compress
+ if(NOT NSIS_MAKENSIS)
+ set(CPACK_GENERATOR TGZ)
+ endif()
+endif()
+if(UNIX AND NOT APPLE)
+ set(CPACK_GENERATOR "TGZ;STGZ;TZ")
+ # find_program(found_compress
# NAMES compress)
- # IF(found_compress)
- # FIND_PROGRAM(file_command NAMES file)
- # IF(NOT file_command)
+ # if(found_compress)
+ # find_program(file_command NAMES file)
+ # if(NOT file_command)
# set(file_command file)
- # ENDIF(NOT file_command)
- # EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
+ # endif()
+ # execute_process(COMMAND ${file_command} ${found_compress}
# OUTPUT_VARIABLE output)
# set(SKIP_TZ FALSE)
# if("${output}" MATCHES "script")
# set(SKIP_TZ TRUE)
- # endif("${output}" MATCHES "script")
+ # endif()
# if("${output}" MATCHES "dummy.sh")
# set(SKIP_TZ TRUE)
- # endif("${output}" MATCHES "dummy.sh")
+ # endif()
# if(NOT SKIP_TZ)
# message("compress found and it was not a script")
# message("output from file command: [${output}]")
- # SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
- # else(NOT SKIP_TZ)
+ # set(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
+ # else()
# message("compress found, but it was a script so dont use it")
# message("output from file command: [${output}]")
- # endif(NOT SKIP_TZ)
- # ENDIF(found_compress)
- FIND_PROGRAM(found_bz2
+ # endif()
+ # endif()
+ find_program(found_bz2
NAMES bzip2)
- IF(found_bz2)
- SET(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2")
- ENDIF(found_bz2)
-ENDIF(UNIX AND NOT APPLE)
+ if(found_bz2)
+ set(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2")
+ endif()
+endif()
-SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
-SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
-SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
-INCLUDE(InstallRequiredSystemLibraries)
+set(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
+set(CMAKE_INSTALL_MFC_LIBRARIES 1)
+set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
+include(InstallRequiredSystemLibraries)
-IF(CTEST_TEST_CPACK)
- SET(PACKAGE_TARGET --build-target package)
+if(CTEST_TEST_CPACK)
+ set(PACKAGE_TARGET --build-target package)
# Avoid settings that require the .zip file command line tools...
# (just build an NSIS installer without component support)
#
- SET(CPACK_BINARY_ZIP OFF)
- SET(CPACK_MONOLITHIC_INSTALL ON)
-ELSE(CTEST_TEST_CPACK)
- SET(PACKAGE_TARGET)
-ENDIF(CTEST_TEST_CPACK)
+ set(CPACK_BINARY_ZIP OFF)
+ set(CPACK_MONOLITHIC_INSTALL ON)
+else()
+ set(PACKAGE_TARGET)
+endif()
-INCLUDE(CPack)
+include(CPack)
-ADD_CUSTOM_COMMAND(
+add_custom_command(
TARGET ${install_target}
POST_BUILD
COMMAND ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/SimpleInstallS2/InstallScript1.cmake b/Tests/SimpleInstallS2/InstallScript1.cmake
index 27b7725..ef9da57 100644
--- a/Tests/SimpleInstallS2/InstallScript1.cmake
+++ b/Tests/SimpleInstallS2/InstallScript1.cmake
@@ -1,5 +1,5 @@
-MESSAGE("This is install script 1.")
-SET(INSTALL_SCRIPT_1_DID_RUN 1)
-IF(INSTALL_CODE_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 1 did not run before install code.")
-ENDIF(INSTALL_CODE_DID_RUN)
+message("This is install script 1.")
+set(INSTALL_SCRIPT_1_DID_RUN 1)
+if(INSTALL_CODE_DID_RUN)
+ message(FATAL_ERROR "Install script 1 did not run before install code.")
+endif()
diff --git a/Tests/SimpleInstallS2/InstallScript2.cmake b/Tests/SimpleInstallS2/InstallScript2.cmake
index 927cae8..c1d20a3 100644
--- a/Tests/SimpleInstallS2/InstallScript2.cmake
+++ b/Tests/SimpleInstallS2/InstallScript2.cmake
@@ -1,14 +1,14 @@
-MESSAGE("This is install script 2.")
-IF(INSTALL_SCRIPT_1_DID_RUN)
- MESSAGE("Install script ordering works.")
-ELSE(INSTALL_SCRIPT_1_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 1 did not run before install script 2.")
-ENDIF(INSTALL_SCRIPT_1_DID_RUN)
-IF(INSTALL_CODE_DID_RUN)
- MESSAGE("Install code ordering works.")
-ELSE(INSTALL_CODE_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 2 did not run after install code.")
-ENDIF(INSTALL_CODE_DID_RUN)
-FILE(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScriptOut.cmake"
- "SET(CMAKE_INSTALL_SCRIPT_DID_RUN 1)\n"
+message("This is install script 2.")
+if(INSTALL_SCRIPT_1_DID_RUN)
+ message("Install script ordering works.")
+else()
+ message(FATAL_ERROR "Install script 1 did not run before install script 2.")
+endif()
+if(INSTALL_CODE_DID_RUN)
+ message("Install code ordering works.")
+else()
+ message(FATAL_ERROR "Install script 2 did not run after install code.")
+endif()
+file(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScriptOut.cmake"
+ "set(CMAKE_INSTALL_SCRIPT_DID_RUN 1)\n"
)
diff --git a/Tests/SimpleInstallS2/InstallScript3.cmake b/Tests/SimpleInstallS2/InstallScript3.cmake
index b1aecd4..6485156 100644
--- a/Tests/SimpleInstallS2/InstallScript3.cmake
+++ b/Tests/SimpleInstallS2/InstallScript3.cmake
@@ -1,12 +1,12 @@
-MESSAGE("This is install script 3.")
-SET(INSTALL_SCRIPT_3_DID_RUN 1)
-IF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 3 did not run before install code with component.")
-ENDIF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
+message("This is install script 3.")
+set(INSTALL_SCRIPT_3_DID_RUN 1)
+if(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
+ message(FATAL_ERROR "Install script 3 did not run before install code with component.")
+endif()
-IF(CMAKE_INSTALL_COMPONENT)
-IF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
- MESSAGE("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
- MESSAGE(FATAL_ERROR "Install script 3 should only run for \"Development\" INSTALL COMPONENT.")
-ENDIF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
-ENDIF(CMAKE_INSTALL_COMPONENT)
+if(CMAKE_INSTALL_COMPONENT)
+if(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
+ message("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
+ message(FATAL_ERROR "Install script 3 should only run for \"Development\" INSTALL COMPONENT.")
+endif()
+endif()
diff --git a/Tests/SimpleInstallS2/InstallScript4.cmake b/Tests/SimpleInstallS2/InstallScript4.cmake
index 0ffea4b..34d0a73 100644
--- a/Tests/SimpleInstallS2/InstallScript4.cmake
+++ b/Tests/SimpleInstallS2/InstallScript4.cmake
@@ -1,22 +1,22 @@
-MESSAGE("This is install script 4.")
-IF(INSTALL_SCRIPT_3_DID_RUN)
- MESSAGE("Install script ordering works.")
-ELSE(INSTALL_SCRIPT_3_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 3 did not run before install script 4.")
-ENDIF(INSTALL_SCRIPT_3_DID_RUN)
-IF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
- MESSAGE("Install code ordering works.")
-ELSE(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
- MESSAGE(FATAL_ERROR "Install script 4 did not run after install with component code.")
-ENDIF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
+message("This is install script 4.")
+if(INSTALL_SCRIPT_3_DID_RUN)
+ message("Install script ordering works.")
+else()
+ message(FATAL_ERROR "Install script 3 did not run before install script 4.")
+endif()
+if(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
+ message("Install code ordering works.")
+else()
+ message(FATAL_ERROR "Install script 4 did not run after install with component code.")
+endif()
-IF(CMAKE_INSTALL_COMPONENT)
-IF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
- MESSAGE("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
- MESSAGE(FATAL_ERROR "Install script 4 should only run for \"Development\" INSTALL COMPONENT.")
-ENDIF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
-ENDIF(CMAKE_INSTALL_COMPONENT)
+if(CMAKE_INSTALL_COMPONENT)
+if(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
+ message("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
+ message(FATAL_ERROR "Install script 4 should only run for \"Development\" INSTALL COMPONENT.")
+endif()
+endif()
-FILE(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScript4Out.cmake"
- "SET(CMAKE_INSTALL_SCRIPT_4_DID_RUN 1)\n"
+file(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScript4Out.cmake"
+ "set(CMAKE_INSTALL_SCRIPT_4_DID_RUN 1)\n"
)
diff --git a/Tests/SimpleInstallS2/PackageScript.cmake b/Tests/SimpleInstallS2/PackageScript.cmake
index 3567a2f..53b7909 100644
--- a/Tests/SimpleInstallS2/PackageScript.cmake
+++ b/Tests/SimpleInstallS2/PackageScript.cmake
@@ -1,10 +1,10 @@
-MESSAGE("This is packaging script")
-MESSAGE("It writes a file with all variables available in ${CMAKE_INSTALL_PREFIX}/AllVariables.txt")
+message("This is packaging script")
+message("It writes a file with all variables available in ${CMAKE_INSTALL_PREFIX}/AllVariables.txt")
-FILE(WRITE ${CMAKE_INSTALL_PREFIX}/AllVariables.txt "")
-GET_CMAKE_PROPERTY(res VARIABLES)
-FOREACH(var ${res})
- FILE(APPEND ${CMAKE_INSTALL_PREFIX}/AllVariables.txt
+file(WRITE ${CMAKE_INSTALL_PREFIX}/AllVariables.txt "")
+get_cmake_property(res VARIABLES)
+foreach(var ${res})
+ file(APPEND ${CMAKE_INSTALL_PREFIX}/AllVariables.txt
"${var} \"${${var}}\"\n")
-ENDFOREACH(var ${res})
+endforeach()
diff --git a/Tests/SimpleInstallS2/PostInstall.cmake b/Tests/SimpleInstallS2/PostInstall.cmake
index 52ea140..d616221 100644
--- a/Tests/SimpleInstallS2/PostInstall.cmake
+++ b/Tests/SimpleInstallS2/PostInstall.cmake
@@ -1,6 +1,6 @@
-MESSAGE("In post install")
-IF(PRE_INSTALL_DID_RUN)
- MESSAGE("Pre and post install work fine")
-ELSE(PRE_INSTALL_DID_RUN)
- MESSAGE(FATAL_ERROR "Pre install did not run before post install")
-ENDIF(PRE_INSTALL_DID_RUN)
+message("In post install")
+if(PRE_INSTALL_DID_RUN)
+ message("Pre and post install work fine")
+else()
+ message(FATAL_ERROR "Pre install did not run before post install")
+endif()
diff --git a/Tests/SimpleInstallS2/PreInstall.cmake b/Tests/SimpleInstallS2/PreInstall.cmake
index 2ea2f77..7a9851e 100644
--- a/Tests/SimpleInstallS2/PreInstall.cmake
+++ b/Tests/SimpleInstallS2/PreInstall.cmake
@@ -1,2 +1,2 @@
-MESSAGE("This is in pre install")
-SET(PRE_INSTALL_DID_RUN 1)
+message("This is in pre install")
+set(PRE_INSTALL_DID_RUN 1)
diff --git a/Tests/SimpleInstallS2/TestSubDir/CMakeLists.txt b/Tests/SimpleInstallS2/TestSubDir/CMakeLists.txt
index 4f62953..860e104 100644
--- a/Tests/SimpleInstallS2/TestSubDir/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/TestSubDir/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_EXECUTABLE(TSD TSD.cxx TSD_utils.cxx)
-INSTALL_FILES(/MyTest/include FILES TSD.h)
-INSTALL_TARGETS(/MyTest/bin TSD)
+add_executable(TSD TSD.cxx TSD_utils.cxx)
+install_files(/MyTest/include FILES TSD.h)
+install_targets(/MyTest/bin TSD)
diff --git a/Tests/SimpleInstallS2/lib2.h b/Tests/SimpleInstallS2/lib2.h
index ea5a6f7..d69b786 100644
--- a/Tests/SimpleInstallS2/lib2.h
+++ b/Tests/SimpleInstallS2/lib2.h
@@ -5,7 +5,7 @@
# define CM_TEST_LIB_EXPORT __declspec( dllimport )
# endif
#else
-# define CM_TEST_LIB_EXPORT
+# define CM_TEST_LIB_EXPORT
#endif
CM_TEST_LIB_EXPORT float Lib2Func();
diff --git a/Tests/SimpleInstallS2/lib3.h b/Tests/SimpleInstallS2/lib3.h
index c250ed7..66bc52a 100644
--- a/Tests/SimpleInstallS2/lib3.h
+++ b/Tests/SimpleInstallS2/lib3.h
@@ -5,7 +5,7 @@
# define CM_TEST_LIB_EXPORT __declspec( dllimport )
# endif
#else
-# define CM_TEST_LIB_EXPORT
+# define CM_TEST_LIB_EXPORT
#endif
CM_TEST_LIB_EXPORT float Lib3Func();
diff --git a/Tests/SimpleInstallS2/lib4.h b/Tests/SimpleInstallS2/lib4.h
index 4b94ea2..11c1272 100644
--- a/Tests/SimpleInstallS2/lib4.h
+++ b/Tests/SimpleInstallS2/lib4.h
@@ -5,7 +5,7 @@
# define CM_TEST_LIB_EXPORT __declspec( dllimport )
# endif
#else
-# define CM_TEST_LIB_EXPORT
+# define CM_TEST_LIB_EXPORT
#endif
CM_TEST_LIB_EXPORT float Lib4Func();
diff --git a/Tests/SimpleInstallS2/scripts/CMakeLists.txt b/Tests/SimpleInstallS2/scripts/CMakeLists.txt
index d46c165..ec34e8c 100644
--- a/Tests/SimpleInstallS2/scripts/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/scripts/CMakeLists.txt
@@ -1 +1 @@
-INSTALL_PROGRAMS(/MyTest/share/old3 "^sample_script(\\.bat)?$")
+install_programs(/MyTest/share/old3 "^sample_script(\\.bat)?$")