diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-14 13:24:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-14 13:24:00 (GMT) |
| commit | 2fe520d2b0b106ee65e54d037245228269adb43c (patch) | |
| tree | 0c9c520f3dd72aad1b131f77b2cd9cab3f34befa /Source | |
| parent | 2364819d37a52c6dacad5d0091b1c755f9c2c84e (diff) | |
| parent | 2aadb02f835313dd63a1f484f3c3c53c992932f1 (diff) | |
| download | CMake-2fe520d2b0b106ee65e54d037245228269adb43c.zip CMake-2fe520d2b0b106ee65e54d037245228269adb43c.tar.gz CMake-2fe520d2b0b106ee65e54d037245228269adb43c.tar.bz2 | |
Merge topic 'cmake-ifw-package-updates'
2aadb02f QtIFW: Don't show component selection page if it don't need
53992808 QtIFW: process USE_LGPL when CMake_INSTALL_COMPONENTS
8ae035a5 CMake: install COMPONENT cmcldeps
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Source/QtIFW/installscript.qs.in | 3 |
2 files changed, 13 insertions, 8 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index d49ebbb..a790994 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -530,11 +530,14 @@ set(SRCS ${SRCS} cmNinjaUtilityTargetGenerator.h ) +# Temporary variable for tools targets +set(_tools) + if(WIN32 AND NOT CYGWIN) set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501) add_executable(cmcldeps cmcldeps.cxx ${MANIFEST_FILE}) + list(APPEND _tools cmcldeps) target_link_libraries(cmcldeps CMakeLib) - install(TARGETS cmcldeps DESTINATION bin) endif() foreach(v CURL_CA_BUNDLE CURL_CA_PATH) @@ -746,6 +749,7 @@ endif() if(APPLE) add_executable(cmakexbuild cmakexbuild.cxx) + list(APPEND _tools cmakexbuild) target_link_libraries(cmakexbuild CMakeLib) add_executable(OSXScriptLauncher CPack/OSXScriptLauncher.cxx) @@ -755,14 +759,17 @@ endif() # Build CMake executable add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE}) +list(APPEND _tools cmake) target_link_libraries(cmake CMakeLib) # Build CTest executable add_executable(ctest ctest.cxx ${MANIFEST_FILE}) +list(APPEND _tools ctest) target_link_libraries(ctest CTestLib) # Build CPack executable add_executable(cpack CPack/cpack.cxx ${MANIFEST_FILE}) +list(APPEND _tools cpack) target_link_libraries(cpack CPackLib) # Curses GUI @@ -781,15 +788,12 @@ include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL) # Install tools -set(_tools cmake ctest cpack) - -if(APPLE) - list(APPEND _tools cmakexbuild) -endif() - foreach(_tool ${_tools}) CMake_OPTIONAL_COMPONENT(${_tool}) install(TARGETS ${_tool} DESTINATION ${CMAKE_BIN_DIR} ${COMPONENT}) endforeach() install(FILES cmCPluginAPI.h DESTINATION ${CMAKE_DATA_DIR}/include) + +# Unset temporary variables +unset(_tools) diff --git a/Source/QtIFW/installscript.qs.in b/Source/QtIFW/installscript.qs.in index 3411e34..39a8795 100644 --- a/Source/QtIFW/installscript.qs.in +++ b/Source/QtIFW/installscript.qs.in @@ -1,6 +1,7 @@ function Component() { - // default constructor + // Do not show component selection page + installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); } Component.prototype.createOperations = function() |