[cmake28/el6] Update to version 2.8.10 and rebase cmake28 patch
Jonathan G. Underwood
jgu at fedoraproject.org
Mon Mar 4 17:34:07 UTC 2013
commit a778805cf463127884b98084f39d34fbfa72e2e2
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Mon Mar 4 17:33:59 2013 +0000
Update to version 2.8.10 and rebase cmake28 patch
.gitignore | 1 +
cmake28.patch | 326 +++++++++++++++++++++++++++++----------------------------
cmake28.spec | 5 +-
sources | 2 +-
4 files changed, 172 insertions(+), 162 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15b9870..cec9ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cmake-2.8.8.tar.gz
/cmake-2.8.9.tar.gz
+/cmake-2.8.10.tar.gz
diff --git a/cmake28.patch b/cmake28.patch
index 325c1fb..a806f8c 100644
--- a/cmake28.patch
+++ b/cmake28.patch
@@ -1,7 +1,7 @@
-diff -up cmake-2.8.9/bootstrap.cmake28 cmake-2.8.9/bootstrap
---- cmake-2.8.9/bootstrap.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/bootstrap 2013-03-04 11:44:01.580938858 +0000
-@@ -1445,8 +1445,8 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_
+diff -up cmake-2.8.10/bootstrap.cmake28 cmake-2.8.10/bootstrap
+--- cmake-2.8.10/bootstrap.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/bootstrap 2013-03-04 16:09:05.238910648 +0000
+@@ -1454,8 +1454,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}\"`"
@@ -12,7 +12,7 @@ diff -up cmake-2.8.9/bootstrap.cmake28 cmake-2.8.9/bootstrap
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"
-@@ -1552,7 +1552,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1"
+@@ -1569,7 +1569,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1"
if [ -n "${cmake_verbose}" ]; then
cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
fi
@@ -21,26 +21,26 @@ diff -up cmake-2.8.9/bootstrap.cmake28 cmake-2.8.9/bootstrap
RES=$?
if [ "${RES}" -ne "0" ]; then
cmake_error 11 "Problem while running initial CMake"
-diff -up cmake-2.8.9/CMakeLists.txt.cmake28 cmake-2.8.9/CMakeLists.txt
---- cmake-2.8.9/CMakeLists.txt.cmake28 2012-08-09 19:15:18.000000000 +0100
-+++ cmake-2.8.9/CMakeLists.txt 2013-03-04 11:44:01.580938858 +0000
-@@ -151,9 +151,9 @@ MACRO(CMAKE_SETUP_TESTING)
+diff -up cmake-2.8.10/CMakeLists.txt.cmake28 cmake-2.8.10/CMakeLists.txt
+--- cmake-2.8.10/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
++++ cmake-2.8.10/CMakeLists.txt 2013-03-04 16:12:59.432968824 +0000
+@@ -150,9 +150,9 @@ macro(CMAKE_SETUP_TESTING)
# the ctest from this cmake is used for testing
# and not the ctest from the cmake building and testing
# cmake.
-- 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}/ctest28")
-+ SET(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake28")
-+ SET(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack28")
- ENDIF(BUILD_TESTING)
+- 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}/ctest28")
++ set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake28")
++ set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack28")
+ endif()
# configure some files for testing
-diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
---- cmake-2.8.9/Source/cmake.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/cmake.cxx 2013-03-04 11:44:01.581941833 +0000
-@@ -949,7 +949,7 @@ int cmake::AddCMakePaths()
+diff -up cmake-2.8.10/Source/cmake.cxx.cmake28 cmake-2.8.10/Source/cmake.cxx
+--- cmake-2.8.10/Source/cmake.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Source/cmake.cxx 2013-03-04 16:09:05.241910501 +0000
+@@ -954,7 +954,7 @@ int cmake::AddCMakePaths()
// Find the cmake executable
std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
@@ -49,7 +49,7 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
cMakeSelf += cmSystemTools::GetExecutableExtension();
#if __APPLE__
// on the apple this might be the gui bundle
-@@ -994,12 +994,12 @@ int cmake::AddCMakePaths()
+@@ -999,12 +999,12 @@ int cmake::AddCMakePaths()
if( !cmSystemTools::FileExists(editCacheCommand.c_str()))
{
editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -64,7 +64,7 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
}
if(cmSystemTools::FileExists(editCacheCommand.c_str()))
{
-@@ -1009,7 +1009,7 @@ int cmake::AddCMakePaths()
+@@ -1014,7 +1014,7 @@ int cmake::AddCMakePaths()
}
}
std::string ctestCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -73,7 +73,7 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
if(cmSystemTools::FileExists(ctestCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -1017,7 +1017,7 @@ int cmake::AddCMakePaths()
+@@ -1022,7 +1022,7 @@ int cmake::AddCMakePaths()
"Path to ctest program executable.", cmCacheManager::INTERNAL);
}
std::string cpackCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
@@ -82,7 +82,7 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
if(cmSystemTools::FileExists(cpackCommand.c_str()))
{
this->CacheManager->AddCacheEntry
-@@ -3023,7 +3023,7 @@ const char* cmake::GetCTestCommand()
+@@ -3039,7 +3039,7 @@ const char* cmake::GetCTestCommand()
{
if ( this->CTestCommand.empty() )
{
@@ -91,7 +91,7 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
}
if ( this->CTestCommand.empty() )
{
-@@ -3037,7 +3037,7 @@ const char* cmake::GetCPackCommand()
+@@ -3053,7 +3053,7 @@ const char* cmake::GetCPackCommand()
{
if ( this->CPackCommand.empty() )
{
@@ -100,53 +100,53 @@ diff -up cmake-2.8.9/Source/cmake.cxx.cmake28 cmake-2.8.9/Source/cmake.cxx
}
if ( this->CPackCommand.empty() )
{
-diff -up cmake-2.8.9/Source/CMakeLists.txt.cmake28 cmake-2.8.9/Source/CMakeLists.txt
---- cmake-2.8.9/Source/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/CMakeLists.txt 2013-03-04 11:44:01.582942064 +0000
-@@ -520,8 +520,8 @@ IF(APPLE)
- ENDIF(APPLE)
+diff -up cmake-2.8.10/Source/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CMakeLists.txt
+--- cmake-2.8.10/Source/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
++++ cmake-2.8.10/Source/CMakeLists.txt 2013-03-04 16:16:21.395968820 +0000
+@@ -533,8 +533,8 @@ if(APPLE)
+ endif()
# Build CMake executable
--ADD_EXECUTABLE(cmake cmakemain.cxx)
--TARGET_LINK_LIBRARIES(cmake CMakeLib)
-+ADD_EXECUTABLE(cmake28 cmakemain.cxx)
-+TARGET_LINK_LIBRARIES(cmake28 CMakeLib)
+-add_executable(cmake cmakemain.cxx)
+-target_link_libraries(cmake CMakeLib)
++add_executable(cmake28 cmakemain.cxx)
++target_link_libraries(cmake28 CMakeLib)
# Build special executable for running programs on Windows 98
- IF(WIN32)
-@@ -533,12 +533,12 @@ IF(WIN32)
- ENDIF(WIN32)
+ if(WIN32)
+@@ -546,12 +546,12 @@ if(WIN32)
+ endif()
# Build CTest executable
--ADD_EXECUTABLE(ctest ctest.cxx)
--TARGET_LINK_LIBRARIES(ctest CTestLib)
-+ADD_EXECUTABLE(ctest28 ctest.cxx)
-+TARGET_LINK_LIBRARIES(ctest28 CTestLib)
+-add_executable(ctest ctest.cxx)
+-target_link_libraries(ctest CTestLib)
++add_executable(ctest28 ctest.cxx)
++target_link_libraries(ctest28 CTestLib)
# Build CPack executable
--ADD_EXECUTABLE(cpack CPack/cpack.cxx)
--TARGET_LINK_LIBRARIES(cpack CPackLib)
-+ADD_EXECUTABLE(cpack28 CPack/cpack.cxx)
-+TARGET_LINK_LIBRARIES(cpack28 CPackLib)
+-add_executable(cpack CPack/cpack.cxx)
+-target_link_libraries(cpack CPackLib)
++add_executable(cpack28 CPack/cpack.cxx)
++target_link_libraries(cpack28 CPackLib)
# Curses GUI
- IF(BUILD_CursesDialog)
-@@ -554,9 +554,9 @@ ENDIF(BUILD_QtDialog)
- INCLUDE (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
- INCLUDE (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+ if(BUILD_CursesDialog)
+@@ -567,9 +567,9 @@ endif()
+ include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+ include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
--INSTALL_TARGETS(/bin cmake)
--INSTALL_TARGETS(/bin ctest)
--INSTALL_TARGETS(/bin cpack)
-+INSTALL_TARGETS(/bin cmake28)
-+INSTALL_TARGETS(/bin ctest28)
-+INSTALL_TARGETS(/bin cpack28)
- IF(APPLE)
- INSTALL_TARGETS(/bin cmakexbuild)
- ENDIF(APPLE)
-diff -up cmake-2.8.9/Source/cmCTest.cxx.cmake28 cmake-2.8.9/Source/cmCTest.cxx
---- cmake-2.8.9/Source/cmCTest.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/cmCTest.cxx 2013-03-04 11:44:01.583942125 +0000
+-install_targets(/bin cmake)
+-install_targets(/bin ctest)
+-install_targets(/bin cpack)
++install_targets(/bin cmake28)
++install_targets(/bin ctest28)
++install_targets(/bin cpack28)
+ if(APPLE)
+ install_targets(/bin cmakexbuild)
+ endif()
+diff -up cmake-2.8.10/Source/cmCTest.cxx.cmake28 cmake-2.8.10/Source/cmCTest.cxx
+--- cmake-2.8.10/Source/cmCTest.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Source/cmCTest.cxx 2013-03-04 16:09:05.244910823 +0000
@@ -2486,7 +2486,7 @@ void cmCTest::FindRunningCMake()
{
// Find our own executable.
@@ -165,10 +165,10 @@ diff -up cmake-2.8.9/Source/cmCTest.cxx.cmake28 cmake-2.8.9/Source/cmCTest.cxx
this->CMakeSelf += cmSystemTools::GetExecutableExtension();
if(!cmSystemTools::FileExists(this->CMakeSelf.c_str()))
{
-diff -up cmake-2.8.9/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.9/Source/cmGlobalGenerator.cxx
---- cmake-2.8.9/Source/cmGlobalGenerator.cxx.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/cmGlobalGenerator.cxx 2013-03-04 11:44:01.583942125 +0000
-@@ -1980,7 +1980,7 @@ void cmGlobalGenerator::CreateDefaultGlo
+diff -up cmake-2.8.10/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.10/Source/cmGlobalGenerator.cxx
+--- cmake-2.8.10/Source/cmGlobalGenerator.cxx.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Source/cmGlobalGenerator.cxx 2013-03-04 16:09:05.246938773 +0000
+@@ -1974,7 +1974,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.
@@ -177,25 +177,25 @@ diff -up cmake-2.8.9/Source/cmGlobalGenerator.cxx.cmake28 cmake-2.8.9/Source/cmG
}
singleLine.push_back(cmd.c_str());
if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' )
-diff -up cmake-2.8.9/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.9/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.9/Source/CursesDialog/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/CursesDialog/CMakeLists.txt 2013-03-04 11:44:01.584942171 +0000
-@@ -30,8 +30,8 @@ INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+diff -up cmake-2.8.10/Source/CursesDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.10/Source/CursesDialog/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
++++ cmake-2.8.10/Source/CursesDialog/CMakeLists.txt 2013-03-04 16:18:08.652938120 +0000
+@@ -30,8 +30,8 @@ include_directories(${CMake_SOURCE_DIR}/
+ include_directories(${CURSES_INCLUDE_PATH})
--ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
--TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+ADD_EXECUTABLE(ccmake28 ${CURSES_SRCS} )
-+TARGET_LINK_LIBRARIES(ccmake28 CMakeLib)
-+TARGET_LINK_LIBRARIES(ccmake28 cmForm)
+-add_executable(ccmake ${CURSES_SRCS} )
+-target_link_libraries(ccmake CMakeLib)
+-target_link_libraries(ccmake cmForm)
++add_executable(ccmake28 ${CURSES_SRCS} )
++target_link_libraries(ccmake28 CMakeLib)
++target_link_libraries(ccmake28 cmForm)
--INSTALL_TARGETS(/bin ccmake)
-+INSTALL_TARGETS(/bin ccmake28)
-diff -up cmake-2.8.9/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.9/Source/QtDialog/CMake.desktop
---- cmake-2.8.9/Source/QtDialog/CMake.desktop.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/QtDialog/CMake.desktop 2013-03-04 11:44:01.584942171 +0000
+-install_targets(/bin ccmake)
++install_targets(/bin ccmake28)
+diff -up cmake-2.8.10/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.10/Source/QtDialog/CMake.desktop
+--- cmake-2.8.10/Source/QtDialog/CMake.desktop.cmake28 2012-10-31 15:32:05.000000000 +0000
++++ cmake-2.8.10/Source/QtDialog/CMake.desktop 2013-03-04 16:09:05.247937747 +0000
@@ -1,9 +1,9 @@
[Desktop Entry]
Version=1.0
@@ -209,43 +209,43 @@ diff -up cmake-2.8.9/Source/QtDialog/CMake.desktop.cmake28 cmake-2.8.9/Source/Qt
Terminal=false
X-MultipleArgs=false
Type=Application
-diff -up cmake-2.8.9/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.9/Source/QtDialog/CMakeLists.txt
---- cmake-2.8.9/Source/QtDialog/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Source/QtDialog/CMakeLists.txt 2013-03-04 11:44:01.584942171 +0000
-@@ -69,8 +69,8 @@ ELSE(NOT QT4_FOUND)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+diff -up cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 cmake-2.8.10/Source/QtDialog/CMakeLists.txt
+--- cmake-2.8.10/Source/QtDialog/CMakeLists.txt.cmake28 2012-10-31 15:32:05.000000000 +0000
++++ cmake-2.8.10/Source/QtDialog/CMakeLists.txt 2013-03-04 16:22:07.111938950 +0000
+@@ -87,8 +87,8 @@ endif()
-- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-- TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
-+ ADD_EXECUTABLE(cmake28-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+ TARGET_LINK_LIBRARIES(cmake28-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
- IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
- IF(APPLE)
- SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
-@@ -80,14 +80,14 @@ ELSE(NOT QT4_FOUND)
- BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
- ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
-- INSTALL(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
-+ INSTALL(TARGETS cmake28-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
+-target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
++add_executable(cmake28-gui WIN32 MACOSX_BUNDLE ${SRCS})
++target_link_libraries(cmake28-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
- IF(UNIX)
- # install a desktop file so CMake appears in the application start menu
- # with an icon
-- INSTALL(FILES CMake.desktop DESTINATION share/applications )
-- INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps )
-- INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
-+ INSTALL(FILES CMake.desktop DESTINATION share/applications RENAME CMake28.desktop)
-+ INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps RENAME CMake28Setup32.png)
-+ INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages RENAME cmake28cache.xml)
- ENDIF(UNIX)
+ if(APPLE)
+ set_target_properties(cmake-gui PROPERTIES
+@@ -97,14 +97,14 @@ endif()
+ set(CMAKE_INSTALL_DESTINATION_ARGS
+ BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
- IF(APPLE)
-diff -up cmake-2.8.9/Tests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeLists.txt
---- cmake-2.8.9/Tests/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Tests/CMakeLists.txt 2013-03-04 13:51:32.127999238 +0000
-@@ -1754,9 +1754,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+-install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
++install(TARGETS cmake28-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
+
+ if(UNIX)
+ # install a desktop file so CMake appears in the application start menu
+ # with an icon
+- install(FILES CMake.desktop DESTINATION share/applications )
+- install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
+- install(FILES cmakecache.xml DESTINATION share/mime/packages )
++ install(FILES CMake.desktop DESTINATION share/applications RENAME CMake28.desktop )
++ install(FILES CMakeSetup32.png DESTINATION share/pixmaps RENAME CMake28Setup32.png)
++ install(FILES cmakecache.xml DESTINATION share/mime/packages RENAME cmake28cache.xml)
+ endif()
+
+ if(APPLE)
+diff -up cmake-2.8.10/Tests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeLists.txt
+--- cmake-2.8.10/Tests/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Tests/CMakeLists.txt 2013-03-04 16:09:05.250936537 +0000
+@@ -1759,9 +1759,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCoverage")
add_test(NAME CTestGTMCoverage
@@ -257,7 +257,7 @@ diff -up cmake-2.8.9/Tests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeLists.t
set_tests_properties(CTestGTMCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*127.*Percentage Coverage: 85.83.*"
-@@ -1771,9 +1771,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+@@ -1776,9 +1776,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage")
add_test(NAME CTestCacheCoverage
@@ -269,39 +269,39 @@ diff -up cmake-2.8.9/Tests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeLists.t
set_tests_properties(CTestCacheCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*125.*Percentage Coverage: 85.60.*"
-@@ -2170,7 +2170,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
+@@ -2138,7 +2138,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
--build-makeprogram ${bootstrap}
--build-generator "${CMAKE_TEST_GENERATOR}"
--test-command
- ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
+ ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake28)
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
# Make this test run early during parallel execution
- SET_TESTS_PROPERTIES(BootstrapTest PROPERTIES COST 5000)
-diff -up cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt
---- cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Tests/CMakeTests/CMakeLists.txt 2013-03-04 11:44:01.585942131 +0000
+ set_tests_properties(BootstrapTest PROPERTIES COST 5000)
+diff -up cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt
+--- cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Tests/CMakeTests/CMakeLists.txt 2013-03-04 16:23:44.472969157 +0000
@@ -1,4 +1,4 @@
--SET(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake")
-+SET(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake28")
+-set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake")
++set(CMAKE_EXECUTABLE "${CMake_BIN_DIR}/cmake28")
- MACRO(AddCMakeTest TestName PreArgs)
-diff -up cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
---- cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake 2013-03-04 11:44:01.585942131 +0000
+ macro(AddCMakeTest TestName PreArgs)
+diff -up cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+--- cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake 2013-03-04 16:09:05.251938353 +0000
@@ -10,7 +10,7 @@ if(NOT CPackGen)
message(FATAL_ERROR "CPackGen not set")
- endif(NOT CPackGen)
+ endif()
get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
-set(CPackCommand "${CPACK_LOCATION}/cpack")
+set(CPackCommand "${CPACK_LOCATION}/cpack28")
message("cpack = ${CPackCommand}")
if(NOT CPackCommand)
message(FATAL_ERROR "CPackCommand not set")
-diff -up cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in
---- cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in 2013-03-04 11:44:01.586942112 +0000
+diff -up cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in
+--- cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Tests/CTestConfig/dashboard.cmake.in 2013-03-04 16:09:05.251938353 +0000
@@ -5,7 +5,7 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINAR
file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
@@ -311,9 +311,9 @@ diff -up cmake-2.8.9/Tests/CTestConfig/dashboard.cmake.in.cmake28 cmake-2.8.9/Te
message("CMAKE_COMMAND='${CMAKE_COMMAND}'")
message("CMAKE_CTEST_COMMAND='${CMAKE_CTEST_COMMAND}'")
-diff -up cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt
---- cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-03-04 11:44:01.586942112 +0000
+diff -up cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+--- cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Tests/FindPackageModeMakefileTest/CMakeLists.txt 2013-03-04 16:09:05.252938309 +0000
@@ -19,7 +19,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCH
configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
@@ -323,13 +323,13 @@ diff -up cmake-2.8.9/Tests/FindPackageModeMakefileTest/CMakeLists.txt.cmake28 cm
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY)
-diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMakeLists.txt
---- cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 2012-08-09 19:15:19.000000000 +0100
-+++ cmake-2.8.9/Utilities/CMakeLists.txt 2013-03-04 11:44:01.586942112 +0000
-@@ -17,32 +17,32 @@ MAKE_DIRECTORY(${CMake_BINARY_DIR}/Docs)
- SET(DOC_FILES "")
+diff -up cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 cmake-2.8.10/Utilities/CMakeLists.txt
+--- cmake-2.8.10/Utilities/CMakeLists.txt.cmake28 2012-10-31 15:32:06.000000000 +0000
++++ cmake-2.8.10/Utilities/CMakeLists.txt 2013-03-04 16:28:02.178909699 +0000
+@@ -17,34 +17,34 @@ make_directory(${CMake_BINARY_DIR}/Docs)
+ set(DOC_FILES "")
- SET(MAN_FILES
+ set(MAN_FILES
- ${CMake_BINARY_DIR}/Docs/cmake.1
- ${CMake_BINARY_DIR}/Docs/cmakecommands.1
- ${CMake_BINARY_DIR}/Docs/cmakecompat.1
@@ -345,9 +345,8 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
+ ${CMake_BINARY_DIR}/Docs/cmake28vars.1
+ ${CMake_BINARY_DIR}/Docs/cmake28modules.1
)
- SET(TEXT_FILES
+ set(TEXT_FILES
- ${CMake_BINARY_DIR}/Docs/cmake.txt
-- ${CMake_BINARY_DIR}/Docs/cmake.docbook
- ${CMake_BINARY_DIR}/Docs/cmake-policies.txt
- ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
- ${CMake_BINARY_DIR}/Docs/cmake-variables.txt
@@ -355,7 +354,6 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
- ${CMake_BINARY_DIR}/Docs/cmake-commands.txt
- ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
+ ${CMake_BINARY_DIR}/Docs/cmake28.txt
-+ ${CMake_BINARY_DIR}/Docs/cmake28.docbook
+ ${CMake_BINARY_DIR}/Docs/cmake28-policies.txt
+ ${CMake_BINARY_DIR}/Docs/cmake28-properties.txt
+ ${CMake_BINARY_DIR}/Docs/cmake28-variables.txt
@@ -363,7 +361,7 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
+ ${CMake_BINARY_DIR}/Docs/cmake28-commands.txt
+ ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.txt
)
- SET(HTML_FILES
+ set(HTML_FILES
- ${CMake_BINARY_DIR}/Docs/cmake.html
- ${CMake_BINARY_DIR}/Docs/cmake-policies.html
- ${CMake_BINARY_DIR}/Docs/cmake-properties.html
@@ -379,31 +377,36 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
+ ${CMake_BINARY_DIR}/Docs/cmake28-commands.html
+ ${CMake_BINARY_DIR}/Docs/cmake28-compatcommands.html
)
+ set(DOCBOOK_FILES
+- ${CMake_BINARY_DIR}/Docs/cmake.docbook
++ ${CMake_BINARY_DIR}/Docs/cmake28.docbook
+ )
- MACRO(ADD_DOCS target dependency)
-@@ -85,51 +85,51 @@ ENDIF(BUILD_QtDialog AND "${CMAKE_GENERA
- AND EXISTS "${QT_QMAKE_EXECUTABLE}" AND NOT CMAKE_NO_AUTO_QT_ENV)
+ macro(ADD_DOCS target dependency)
+@@ -84,42 +84,42 @@ if(BUILD_QtDialog AND "${CMAKE_GENERATOR
+ endif()
# add the docs for the executables
-ADD_DOCS(ctest ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
-ADD_DOCS(cpack ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
-ADD_DOCS(ccmake ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+-ADD_DOCS(CMakeSetup ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
+-ADD_DOCS(cmake-gui ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
+ADD_DOCS(ctest28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+ADD_DOCS(cpack28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
+ADD_DOCS(ccmake28 ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt)
- ADD_DOCS(CMakeSetup ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
--ADD_DOCS(cmake-gui ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
++ADD_DOCS(CMake28Setup ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
+ADD_DOCS(cmake28-gui ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in)
# add the documentation for cmake itself
--GET_TARGET_PROPERTY(CMD cmake LOCATION)
-+GET_TARGET_PROPERTY(CMD cmake28 LOCATION)
- ADD_CUSTOM_COMMAND(
+-get_target_property(CMD cmake LOCATION)
++get_target_property(CMD cmake28 LOCATION)
+ add_custom_command(
- OUTPUT ${CMake_BINARY_DIR}/Docs/cmake.txt
+ OUTPUT ${CMake_BINARY_DIR}/Docs/cmake28.txt
- COMMAND ${CMD}
- ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
+ COMMAND ${CMD}
+- ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.txt
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.html
- --help-full ${CMake_BINARY_DIR}/Docs/cmake.1
@@ -427,6 +430,7 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
- --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmakecompat.1
- DEPENDS cmake
++ ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.txt
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.html
+ --help-full ${CMake_BINARY_DIR}/Docs/cmake28.1
@@ -453,14 +457,16 @@ diff -up cmake-2.8.9/Utilities/CMakeLists.txt.cmake28 cmake-2.8.9/Utilities/CMak
MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
)
- INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES ${MAN_FILES})
- INSTALL_FILES(${CMAKE_DOC_DIR} FILES ${HTML_FILES} ${TEXT_FILES})
--INSTALL(FILES cmake.m4 DESTINATION share/aclocal)
-+INSTALL(FILES cmake.m4 DESTINATION share/aclocal RENAME cmake28.m4)
+@@ -129,10 +129,10 @@ install_files(${CMAKE_DOC_DIR} FILES
+ ${HTML_FILES}
+ ${DOCBOOK_FILES}
+ )
+-install(FILES cmake.m4 DESTINATION share/aclocal)
++install(FILES cmake.m4 DESTINATION share/aclocal RENAME cmake28.m4)
# Drive documentation generation.
--ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )
-+ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake28.txt )
+-add_custom_target(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )
++add_custom_target(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake28.txt )
# Documentation testing.
if(BUILD_TESTING)
diff --git a/cmake28.spec b/cmake28.spec
index 345e1c3..90ba423 100644
--- a/cmake28.spec
+++ b/cmake28.spec
@@ -7,7 +7,7 @@
%define rcver %{nil}
Name: cmake28
-Version: 2.8.9
+Version: 2.8.10
Release: 1%{?dist}
Summary: Cross-platform make system
@@ -166,6 +166,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Mon Mar 4 2013 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.10-1
+- Update to version 2.8.10 and rebase cmake28 patch
+
* Fri Mar 1 2013 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.8.9-1
- Update to version 2.8.9 (updated patch from Rex Dieter)
- Remove patch to fix PKG_CONFIG_FOUND (upstreamed, bug #812188)
diff --git a/sources b/sources
index 9ad22f2..eae2cd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-801f4c87f8b604f727df5bf1f05a59e7 cmake-2.8.9.tar.gz
+d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz
More information about the scm-commits
mailing list