For Fedora EPEL we often end up packaging newer versions of cmake as cmakeXY (e.g. cmake34) that can be installed in parallel with the system cmake. This is a fairly invasive process. I'm attaching the current patch I'm working on for this. Is there any interest in cmake itself for supporting this kind of thing?
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane or...@nwra.com Boulder, CO 80301 http://www.nwra.com
diff -up cmake-3.4.1/bootstrap.cmake34 cmake-3.4.1/bootstrap --- cmake-3.4.1/bootstrap.cmake34 2015-12-02 08:43:25.000000000 -0700 +++ cmake-3.4.1/bootstrap 2015-12-07 11:38:15.186608455 -0700 @@ -1346,8 +1346,8 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_ -I`cmake_escape \"${cmake_bootstrap_dir}\"`" cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ -I`cmake_escape \"${cmake_bootstrap_dir}\"`" -echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" -echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" +echo "cmake34: ${objs}" > "${cmake_bootstrap_dir}/Makefile" +echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake34" >> "${cmake_bootstrap_dir}/Makefile" for a in ${CMAKE_CXX_SOURCES}; do src=`cmake_escape "${cmake_source_dir}/Source/${a}.cxx"` echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile" @@ -1465,7 +1465,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1" if [ -n "${cmake_verbose}" ]; then cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1" fi -"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@" +"${cmake_bootstrap_dir}/cmake34" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@" RES=$? if [ "${RES}" -ne "0" ]; then cmake_error 11 "Problem while running initial CMake" diff -up cmake-3.4.1/CMakeLists.txt.cmake34 cmake-3.4.1/CMakeLists.txt --- cmake-3.4.1/CMakeLists.txt.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/CMakeLists.txt 2015-12-07 11:38:15.186608455 -0700 @@ -179,9 +179,9 @@ macro(CMAKE_SETUP_TESTING) set_property(TARGET ${exe} PROPERTY IMPORTED_LOCATION ${CMake_TEST_EXTERNAL_CMAKE}/${exe}) endforeach() else() - set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest") - set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake") - set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack") + set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest34") + set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake34") + set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack34") endif() endif() diff -up cmake-3.4.1/Source/cmake.cxx.cmake34 cmake-3.4.1/Source/cmake.cxx --- cmake-3.4.1/Source/cmake.cxx.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Source/cmake.cxx 2015-12-07 11:38:15.187608450 -0700 @@ -1958,7 +1958,7 @@ int cmake::CheckBuildSystem() if(verbose) { std::ostringstream msg; - msg << "Re-run cmake, missing byproduct: " << *pi << "\n"; + msg << "Re-run cmake34, missing byproduct: " << *pi << "\n"; cmSystemTools::Stdout(msg.str().c_str()); } return 1; @@ -1981,7 +1981,7 @@ int cmake::CheckBuildSystem() if(verbose) { std::ostringstream msg; - msg << "Re-run cmake no CMAKE_MAKEFILE_DEPENDS " + msg << "Re-run cmake34 no CMAKE_MAKEFILE_DEPENDS " "or CMAKE_MAKEFILE_OUTPUTS :\n"; cmSystemTools::Stdout(msg.str().c_str()); } @@ -2007,7 +2007,7 @@ int cmake::CheckBuildSystem() if(verbose) { std::ostringstream msg; - msg << "Re-run cmake: build system dependency is missing\n"; + msg << "Re-run cmake34: build system dependency is missing\n"; cmSystemTools::Stdout(msg.str().c_str()); } return 1; @@ -2033,7 +2033,7 @@ int cmake::CheckBuildSystem() if(verbose) { std::ostringstream msg; - msg << "Re-run cmake: build system output is missing\n"; + msg << "Re-run cmake34: build system output is missing\n"; cmSystemTools::Stdout(msg.str().c_str()); } return 1; @@ -2051,7 +2051,7 @@ int cmake::CheckBuildSystem() if(verbose) { std::ostringstream msg; - msg << "Re-run cmake file: " << out_oldest + msg << "Re-run cmake34 file: " << out_oldest << " older than: " << dep_newest << "\n"; cmSystemTools::Stdout(msg.str().c_str()); } diff -up cmake-3.4.1/Source/CMakeLists.txt.cmake34 cmake-3.4.1/Source/CMakeLists.txt --- cmake-3.4.1/Source/CMakeLists.txt.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/CMakeLists.txt 2015-12-07 11:38:15.187608450 -0700 @@ -717,8 +717,8 @@ add_library(CPackLib ${CPACK_SRCS}) target_link_libraries(CPackLib CMakeLib) if(APPLE) - add_executable(cmakexbuild cmakexbuild.cxx) - target_link_libraries(cmakexbuild CMakeLib) + add_executable(cmakexbuild34 cmakexbuild.cxx) + target_link_libraries(cmakexbuild34 CMakeLib) add_executable(OSXScriptLauncher CPack/OSXScriptLauncher.cxx) target_link_libraries(OSXScriptLauncher cmsys) @@ -726,16 +726,16 @@ if(APPLE) endif() # Build CMake executable -add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE}) -target_link_libraries(cmake CMakeLib) +add_executable(cmake34 cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE}) +target_link_libraries(cmake34 CMakeLib) # Build CTest executable -add_executable(ctest ctest.cxx ${MANIFEST_FILE}) -target_link_libraries(ctest CTestLib) +add_executable(ctest34 ctest.cxx ${MANIFEST_FILE}) +target_link_libraries(ctest34 CTestLib) # Build CPack executable -add_executable(cpack CPack/cpack.cxx ${MANIFEST_FILE}) -target_link_libraries(cpack CPackLib) +add_executable(cpack34 CPack/cpack.cxx ${MANIFEST_FILE}) +target_link_libraries(cpack34 CPackLib) # Curses GUI if(BUILD_CursesDialog) @@ -753,10 +753,10 @@ include (${CMake_SOURCE_DIR}/Source/Loca # Install tools -set(_tools cmake ctest cpack) +set(_tools cmake34 ctest34 cpack34) if(APPLE) - list(APPEND _tools cmakexbuild) + list(APPEND _tools cmakexbuild34) endif() foreach(_tool ${_tools}) diff -up cmake-3.4.1/Source/cmakemain.cxx.cmake34 cmake-3.4.1/Source/cmakemain.cxx diff -up cmake-3.4.1/Source/cmCTest.cxx.cmake34 cmake-3.4.1/Source/cmCTest.cxx --- cmake-3.4.1/Source/cmCTest.cxx.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/cmCTest.cxx 2015-12-07 11:38:15.187608450 -0700 @@ -2007,16 +2007,16 @@ void cmCTest::ErrorMessageUnknownDashDVa cmCTestLog(this, ERROR_MESSAGE, "Available options are:" << std::endl - << " ctest -D Continuous" << std::endl - << " ctest -D Continuous(Start|Update|Configure|Build)" << std::endl - << " ctest -D Continuous(Test|Coverage|MemCheck|Submit)" << std::endl - << " ctest -D Experimental" << std::endl - << " ctest -D Experimental(Start|Update|Configure|Build)" << std::endl - << " ctest -D Experimental(Test|Coverage|MemCheck|Submit)" << std::endl - << " ctest -D Nightly" << std::endl - << " ctest -D Nightly(Start|Update|Configure|Build)" << std::endl - << " ctest -D Nightly(Test|Coverage|MemCheck|Submit)" << std::endl - << " ctest -D NightlyMemoryCheck" << std::endl); + << " ctest34 -D Continuous" << std::endl + << " ctest34 -D Continuous(Start|Update|Configure|Build)" << std::endl + << " ctest34 -D Continuous(Test|Coverage|MemCheck|Submit)" << std::endl + << " ctest34 -D Experimental" << std::endl + << " ctest34 -D Experimental(Start|Update|Configure|Build)" << std::endl + << " ctest34 -D Experimental(Test|Coverage|MemCheck|Submit)" << std::endl + << " ctest34 -D Nightly" << std::endl + << " ctest34 -D Nightly(Start|Update|Configure|Build)" << std::endl + << " ctest34 -D Nightly(Test|Coverage|MemCheck|Submit)" << std::endl + << " ctest34 -D NightlyMemoryCheck" << std::endl); } @@ -2382,7 +2382,7 @@ bool cmCTest::AddVariableDefinition(cons // the main entry point of ctest, called from main int cmCTest::Run(std::vector<std::string> &args, std::string* output) { - const char* ctestExec = "ctest"; + const char* ctestExec = "ctest34"; bool cmakeAndTest = false; bool executeTests = true; bool SRArgumentSpecified = false; diff -up cmake-3.4.1/Source/cmGlobalGenerator.cxx.cmake34 cmake-3.4.1/Source/cmGlobalGenerator.cxx --- cmake-3.4.1/Source/cmGlobalGenerator.cxx.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/cmGlobalGenerator.cxx 2015-12-07 11:38:15.188608444 -0700 @@ -2387,7 +2387,7 @@ void cmGlobalGenerator::CreateDefaultGlo // We are building CMake itself. We cannot use the original // executable to install over itself. The generator will // automatically convert this name to the build-time location. - cmd = "cmake"; + cmd = "cmake34"; } singleLine.push_back(cmd); if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' ) diff -up cmake-3.4.1/Source/cmSystemTools.cxx.cmake34 cmake-3.4.1/Source/cmSystemTools.cxx --- cmake-3.4.1/Source/cmSystemTools.cxx.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Source/cmSystemTools.cxx 2015-12-07 11:38:15.189608439 -0700 @@ -2285,7 +2285,7 @@ void cmSystemTools::FindCMakeResources(c } #endif cmSystemToolsCMakeCommand = exe_dir; - cmSystemToolsCMakeCommand += "/cmake"; + cmSystemToolsCMakeCommand += "/cmake34"; cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension(); #ifndef CMAKE_BUILD_WITH_CMAKE // The bootstrap cmake does not provide the other tools, @@ -2293,27 +2293,27 @@ void cmSystemTools::FindCMakeResources(c exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin"; #endif cmSystemToolsCTestCommand = exe_dir; - cmSystemToolsCTestCommand += "/ctest"; + cmSystemToolsCTestCommand += "/ctest34"; cmSystemToolsCTestCommand += cmSystemTools::GetExecutableExtension(); cmSystemToolsCPackCommand = exe_dir; - cmSystemToolsCPackCommand += "/cpack"; + cmSystemToolsCPackCommand += "/cpack34"; cmSystemToolsCPackCommand += cmSystemTools::GetExecutableExtension(); cmSystemToolsCMakeGUICommand = exe_dir; - cmSystemToolsCMakeGUICommand += "/cmake-gui"; + cmSystemToolsCMakeGUICommand += "/cmake-gui34"; cmSystemToolsCMakeGUICommand += cmSystemTools::GetExecutableExtension(); if(!cmSystemTools::FileExists(cmSystemToolsCMakeGUICommand.c_str())) { cmSystemToolsCMakeGUICommand = ""; } cmSystemToolsCMakeCursesCommand = exe_dir; - cmSystemToolsCMakeCursesCommand += "/ccmake"; + cmSystemToolsCMakeCursesCommand += "/ccmake34"; cmSystemToolsCMakeCursesCommand += cmSystemTools::GetExecutableExtension(); if(!cmSystemTools::FileExists(cmSystemToolsCMakeCursesCommand.c_str())) { cmSystemToolsCMakeCursesCommand = ""; } cmSystemToolsCMClDepsCommand = exe_dir; - cmSystemToolsCMClDepsCommand += "/cmcldeps"; + cmSystemToolsCMClDepsCommand += "/cmcldeps34"; cmSystemToolsCMClDepsCommand += cmSystemTools::GetExecutableExtension(); if(!cmSystemTools::FileExists(cmSystemToolsCMClDepsCommand.c_str())) { diff -up cmake-3.4.1/Source/CursesDialog/CMakeLists.txt.cmake34 cmake-3.4.1/Source/CursesDialog/CMakeLists.txt --- cmake-3.4.1/Source/CursesDialog/CMakeLists.txt.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/CursesDialog/CMakeLists.txt 2015-12-07 11:38:15.189608439 -0700 @@ -33,19 +33,19 @@ endif() include_directories(${CURSES_INCLUDE_PATH}) -add_executable(ccmake ${CURSES_SRCS} ) -target_link_libraries(ccmake CMakeLib) +add_executable(ccmake34 ${CURSES_SRCS} ) +target_link_libraries(ccmake34 CMakeLib) if(CMAKE_USE_SYSTEM_FORM) - target_link_libraries(ccmake + target_link_libraries(ccmake34 ${CURSES_FORM_LIBRARY} ${CURSES_LIBRARY} ) if(CURSES_EXTRA_LIBRARY) - target_link_libraries(ccmake ${CURSES_EXTRA_LIBRARY}) + target_link_libraries(ccmake34 ${CURSES_EXTRA_LIBRARY}) endif() else() - target_link_libraries(ccmake cmForm) + target_link_libraries(ccmake34 cmForm) endif() -CMake_OPTIONAL_COMPONENT(ccmake) -install(TARGETS ccmake DESTINATION bin ${COMPONENT}) +CMake_OPTIONAL_COMPONENT(ccmake34) +install(TARGETS ccmake34 DESTINATION bin ${COMPONENT}) diff -up cmake-3.4.1/Source/QtDialog/CMake.desktop.cmake34 cmake-3.4.1/Source/QtDialog/CMake.desktop --- cmake-3.4.1/Source/QtDialog/CMake.desktop.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/QtDialog/CMake.desktop 2015-12-07 11:38:15.189608439 -0700 @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 -Name=CMake +Name=CMake34 Comment=Cross-platform buildsystem -Exec=cmake-gui %f -Icon=CMakeSetup +Exec=cmake-gui34 %f +Icon=CMakeSetup34 Terminal=false X-MultipleArgs=false Type=Application diff -up cmake-3.4.1/Source/QtDialog/CMakeLists.txt.cmake34 cmake-3.4.1/Source/QtDialog/CMakeLists.txt --- cmake-3.4.1/Source/QtDialog/CMakeLists.txt.cmake34 2015-12-02 08:43:21.000000000 -0700 +++ cmake-3.4.1/Source/QtDialog/CMakeLists.txt 2015-12-07 11:38:15.189608439 -0700 @@ -14,7 +14,7 @@ project(QtDialog) if(POLICY CMP0020) cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required endif() -CMake_OPTIONAL_COMPONENT(cmake-gui) +CMake_OPTIONAL_COMPONENT(cmake-gui34) find_package(Qt5Widgets QUIET) if (Qt5Widgets_FOUND) include_directories(${Qt5Widgets_INCLUDE_DIRS}) @@ -152,14 +152,14 @@ endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) -add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE}) -target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES}) +add_executable(cmake-gui34 WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE}) +target_link_libraries(cmake-gui34 CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES}) if(APPLE) file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware") - set_target_properties(cmake-gui PROPERTIES + set_target_properties(cmake-gui34 PROPERTIES OUTPUT_NAME CMake MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in" MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}" @@ -169,15 +169,15 @@ if(APPLE) # Create a symlink in the build tree to provide a "cmake-gui" next # to the "cmake" executable that refers to the application bundle. - add_custom_command(TARGET cmake-gui POST_BUILD + add_custom_command(TARGET cmake-gui34 POST_BUILD COMMAND ln -sf CMake.app/Contents/MacOS/CMake - $<TARGET_FILE_DIR:cmake>/cmake-gui + $<TARGET_FILE_DIR:cmake>/cmake-gui34 ) endif() set(CMAKE_INSTALL_DESTINATION_ARGS BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT}) -install(TARGETS cmake-gui +install(TARGETS cmake-gui34 RUNTIME DESTINATION bin ${COMPONENT} ${CMAKE_INSTALL_DESTINATION_ARGS}) @@ -202,7 +202,7 @@ endif() if(APPLE) install(CODE " - execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui + execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui34 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin) " ${COMPONENT}) endif() @@ -210,7 +210,7 @@ endif() if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32)) # install rules for including 3rd party libs such as Qt # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation - set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}") + set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui34${CMAKE_EXECUTABLE_SUFFIX}") if(APPLE) set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake") endif() diff -up cmake-3.4.1/Tests/CMakeLists.txt.cmake34 cmake-3.4.1/Tests/CMakeLists.txt --- cmake-3.4.1/Tests/CMakeLists.txt.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Tests/CMakeLists.txt 2015-12-07 14:12:36.538592174 -0700 @@ -249,7 +249,7 @@ if(BUILD_TESTING) endif() add_test(NAME CMake.Copyright - COMMAND cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeCopyright.cmake) + COMMAND cmake34 -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeCopyright.cmake) # add a bunch of standard build-and-test style tests ADD_TEST_MACRO(CommandLineTest CommandLineTest) @@ -676,8 +676,8 @@ if(BUILD_TESTING) file(MAKE_DIRECTORY "${_TEST_DIR}") file(WRITE "${_TEST_DIR}/nightly-cmake.sh" "cd ${_TEST_DIR} -${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} -${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake +${CMake_BINARY_DIR}/bin/cmake34 -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} +${CMake_BINARY_DIR}/bin/cmake34 -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake ") add_test(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh) if(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY) @@ -2482,9 +2482,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA" DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCoverage") add_test(NAME CTestGTMCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/MumpsCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestGTMCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*ZZCOVTST.m.*Total LOC:.*30.*Percentage Coverage: 80.00*" @@ -2500,9 +2500,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA" DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage") add_test(NAME CTestCacheCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestCacheCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*ZZCOVTST.m.*Total LOC:.*29.*Percentage Coverage: 86.21.*" @@ -2518,9 +2518,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev file(COPY "${CMake_SOURCE_DIR}/Tests/PythonCoverage/coveragetest" DESTINATION "${CMake_BINARY_DIR}/Testing/PythonCoverage") add_test(NAME CTestPythonCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/PythonCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestPythonCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*foo.py.*Total LOC:.*13.*Percentage Coverage: 84.62.*" @@ -2536,9 +2536,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev file(COPY "${CMake_SOURCE_DIR}/Tests/CoberturaCoverage/src" DESTINATION "${CMake_BINARY_DIR}/Testing/CoberturaCoverage") add_test(NAME CTestCoberturaCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/CoberturaCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestCoberturaCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*CoverageTest.java.*Total LOC:.*18.*Percentage Coverage: 72.22.*" @@ -2554,9 +2554,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev configure_file("${CMake_BINARY_DIR}/Testing/JacocoCoverage/Coverage/target/site/jacoco.xml.in" "${CMake_BINARY_DIR}/Testing/JacocoCoverage/Coverage/target/site/jacoco.xml") add_test(NAME CTestJacocoCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/JacocoCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestJacocoCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*CoverageTest.java.*Total LOC:.*17.*Percentage Coverage: 76.47*" @@ -2573,9 +2573,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev DESTINATION "${CMake_BINARY_DIR}/Testing/JavascriptCoverage" FILES_MATCHING PATTERN "*.js") add_test(NAME CTestJavascriptCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/JavascriptCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestJavascriptCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*test3.js.*Total LOC:.*49.*Percentage Coverage: 79.59*" @@ -2590,9 +2590,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html" DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage") add_test(NAME CTestDelphiCoverage - COMMAND cmake -E chdir + COMMAND cmake34 -E chdir ${CMake_BINARY_DIR}/Testing/DelphiCoverage - $<TARGET_FILE:ctest> -T Coverage --debug) + $<TARGET_FILE:ctest34> -T Coverage --debug) set_tests_properties(CTestDelphiCoverage PROPERTIES PASS_REGULAR_EXPRESSION "Process file.*UTCovTest.pas.*Total LOC:.*20.*Percentage Coverage: 95.*" @@ -3182,7 +3182,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev ) endif() - add_test(NAME CMakeWizardTest COMMAND cmake -i) + add_test(NAME CMakeWizardTest COMMAND cmake34 -i) set_property(TEST CMakeWizardTest PROPERTY PASS_REGULAR_EXPRESSION "The \"cmake -i\" wizard mode is no longer supported.") diff -up cmake-3.4.1/Tests/CMakeTests/CMakeLists.txt.cmake34 cmake-3.4.1/Tests/CMakeTests/CMakeLists.txt --- cmake-3.4.1/Tests/CMakeTests/CMakeLists.txt.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Tests/CMakeTests/CMakeLists.txt 2015-12-07 11:38:15.190608434 -0700 @@ -1,4 +1,4 @@ -set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake") +set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake34") macro(AddCMakeTest TestName PreArgs) diff -up cmake-3.4.1/Tests/CTestConfig/dashboard.cmake.in.cmake34 cmake-3.4.1/Tests/CTestConfig/dashboard.cmake.in --- cmake-3.4.1/Tests/CTestConfig/dashboard.cmake.in.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Tests/CTestConfig/dashboard.cmake.in 2015-12-07 11:38:15.190608434 -0700 @@ -5,7 +5,7 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINAR file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}") get_filename_component(dir "${CMAKE_COMMAND}" PATH) -set(CMAKE_CTEST_COMMAND "${dir}/ctest") +set(CMAKE_CTEST_COMMAND "${dir}/ctest34") message("CMAKE_COMMAND='${CMAKE_COMMAND}'") message("CMAKE_CTEST_COMMAND='${CMAKE_CTEST_COMMAND}'") diff -up cmake-3.4.1/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake34 cmake-3.4.1/Tests/FindPackageModeMakefileTest/CMakeLists.txt --- cmake-3.4.1/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake34 2015-12-02 08:43:22.000000000 -0700 +++ cmake-3.4.1/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2015-12-07 11:38:15.191608429 -0700 @@ -21,10 +21,10 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCH # now set up the test: if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" - CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n" + CONTENT "CMAKE = \"$<TARGET_FILE:cmake34>\"\n" ) else() - get_target_property(cmakeLocation cmake LOCATION) + get_target_property(cmakeLocation cmake34 LOCATION) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" "CMAKE = \"${cmakeLocation}\"\n" ) diff -up cmake-3.4.1/Utilities/CMakeLists.txt.cmake34 cmake-3.4.1/Utilities/CMakeLists.txt --- cmake-3.4.1/Utilities/CMakeLists.txt.cmake34 2015-12-02 08:43:24.000000000 -0700 +++ cmake-3.4.1/Utilities/CMakeLists.txt 2015-12-07 11:38:15.191608429 -0700 @@ -21,9 +21,9 @@ if(CMAKE_DOC_TARBALL) endif() add_custom_command( OUTPUT ${dir}.stamp - COMMAND cmake -E remove_directory ${dir} - COMMAND cmake -E tar xf ${CMAKE_DOC_TARBALL} - COMMAND cmake -E touch ${dir}.stamp + COMMAND cmake34 -E remove_directory ${dir} + COMMAND cmake34 -E tar xf ${CMAKE_DOC_TARBALL} + COMMAND cmake34 -E touch ${dir}.stamp DEPENDS ${CMAKE_DOC_TARBALL} ) add_custom_target(documentation ALL DEPENDS ${dir}.stamp) diff -up cmake-3.4.1/Utilities/Sphinx/CMakeLists.txt.cmake34 cmake-3.4.1/Utilities/Sphinx/CMakeLists.txt --- cmake-3.4.1/Utilities/Sphinx/CMakeLists.txt.cmake34 2015-12-02 08:43:24.000000000 -0700 +++ cmake-3.4.1/Utilities/Sphinx/CMakeLists.txt 2015-12-07 15:33:02.443551075 -0700 @@ -137,11 +137,11 @@ endforeach() add_custom_target(documentation ALL DEPENDS ${doc_format_outputs}) foreach(t - cmake - ccmake - cmake-gui - cpack - ctest + cmake34 + ccmake34 + cmake-gui34 + cpack34 + ctest34 ) if(TARGET ${t}) # Build documentation after main executables.
-- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers