testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 592384 from home:mathletic:branches:devel:tools:building

Browse Source 
- Updateo to 3.11.0
  * No changes specific to CMake-GUI
- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream
- Updated to 3.11.0
  * The Makefile Generators and the Ninja generator learned to add
    compiler launcher tools
  * The COMPILE_DEFINITIONS source file property learned to support
    generator expressions.
  * COMPILE_OPTIONS source file property was added to manage list
    of options to pass to the compiler.
  * A new FetchContent module was added which supports populating
    content at configure time using any of the download/update
    methods supported by ExternalProject_Add().
  full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html
- Adapted form.patch and c17-default.patch

OBS-URL: https://build.opensuse.org/request/show/592384
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=318
This commit is contained in:
Martin Pluskal 2018-03-30 09:52:24 +00:00 committed by Git OBS Bridge
parent b80a31e004
commit 0801fc4ecb
13 changed files with 60 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
c17-default.patch
View File

@ -66,10 +66,10 @@ Index: cmake-3.10.2/Tests/CompileFeatures/default_dialect.c
-#if DEFAULT_C11
+#if DEFAULT_C17
+#if __STDC_VERSION__ != 201710L
+#if __STDC_VERSION__ < 201710L
+#error Unexpected value for __STDC_VERSION__.
+#endif
+#elif DEFAULT_C11
#if __STDC_VERSION__ != 201112L
#if __STDC_VERSION__ < 201112L
#error Unexpected value for __STDC_VERSION__.
#endif

237
cmake-3.10.1_boost-1.66.patch
View File

@ -1,237 +0,0 @@
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 88d14ab..5db15a5 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -797,9 +797,8 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
endif()
- if(NOT Boost_VERSION VERSION_LESS 106600)
+ if(NOT Boost_VERSION VERSION_LESS 106700)
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
- set(_Boost_IMPORTED_TARGETS FALSE)
endif()
endif()
@@ -831,8 +830,8 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp")
- set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp")
+ set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
set(_Boost_FIBER_HEADERS "boost/fiber/all.hpp")
set(_Boost_FILESYSTEM_HEADERS "boost/filesystem/path.hpp")
set(_Boost_GRAPH_HEADERS "boost/graph/adjacency_list.hpp")
@@ -931,8 +930,8 @@ endfunction()
# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
#
function(_Boost_COMPILER_FEATURES component _ret)
- # Boost >= 1.62 and < 1.65
- if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
+ # Boost >= 1.62 and < 1.67
+ if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)
set(_Boost_FIBER_COMPILER_FEATURES
cxx_alias_templates
cxx_auto_type
@@ -951,6 +950,13 @@ function(_Boost_COMPILER_FEATURES component _ret)
set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
endfunction()
+# Architecture name will be useful for finding library names starting 1.66.0
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(_arch_suffix 64)
+else()
+ set(_arch_suffix 32)
+endif()
+
#
# Update library search directory hint variable with paths used by prebuilt boost binaries.
#
@@ -961,11 +967,7 @@ endfunction()
#
function(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(_arch_suffix 64)
- else()
- set(_arch_suffix 32)
- endif()
+
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.1)
list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
@@ -1038,7 +1040,7 @@ else()
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
# _Boost_COMPONENT_DEPENDENCIES.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.65.1" "1.65.0" "1.65"
+ "1.65.1" "1.65.0" "1.65" "1.66.1" "1.66.0" "1.66"
"1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
@@ -1616,10 +1618,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_RELEASE_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
endforeach()
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
@@ -1627,10 +1631,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endforeach()
list(APPEND _boost_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endif()
@@ -1666,10 +1672,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_DEBUG_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
endforeach()
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
@@ -1678,10 +1686,12 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endforeach()
list(APPEND _boost_DEBUG_NAMES
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-x${_arch_suffix}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endif()
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 76afa8a..a854516 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -187,10 +187,10 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
# set the options that are used as long as the .pc file does not provide a library
# path to look into
if(_no_cmake_path)
- set(_find_opts "NO_CMAKE_PATH")
+ list(APPEND _find_opts "NO_CMAKE_PATH")
endif()
if(_no_cmake_environment_path)
- string(APPEND _find_opts " NO_CMAKE_ENVIRONMENT_PATH")
+ list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
endif()
unset(_search_paths)
@@ -454,7 +454,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
_pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other )
if (_imp_target)
- _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
+ _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
endif()
endif()
@@ -597,7 +597,7 @@ macro(pkg_check_modules _prefix _module0)
_pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
endif()
elseif (${_prefix}_FOUND AND ${_imp_target})
- _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
+ _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
endif()
endmacro()
@@ -648,7 +648,7 @@ macro(pkg_search_module _prefix _module0)
_pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
elseif (${_prefix}_FOUND AND ${_imp_target})
- _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
+ _pkg_create_imp_target("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path})
endif()
endmacro()
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
index 00cbb7b..606b1df 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
@@ -24,3 +24,64 @@ if (NCURSES_FOUND)
else ()
message(STATUS "skipping test; ncurses not found")
endif ()
+
+
+# Setup for the remaining package tests below
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
+set(fakePkgDir ${CMAKE_CURRENT_BINARY_DIR}/pc-fakepackage)
+foreach(i 1 2)
+ set(pname cmakeinternalfakepackage${i})
+ file(WRITE ${fakePkgDir}/lib/lib${pname}.a "")
+ file(WRITE ${fakePkgDir}/lib/${pname}.lib "")
+ file(WRITE ${fakePkgDir}/lib/pkgconfig/${pname}.pc
+"Name: CMakeInternalFakePackage${i}
+Description: Dummy package (${i}) for FindPkgConfig IMPORTED_TARGET test
+Version: 1.2.3
+Libs: -l${pname}
+")
+endforeach()
+
+# Always find the .pc file in the calls further below so that we can test that
+# the import target find_library() calls handle the NO...PATH options correctly
+set(ENV{PKG_CONFIG_PATH} ${fakePkgDir}/lib/pkgconfig)
+
+# Confirm correct behavior of NO_CMAKE_PATH, ensuring we only find the library
+# for the imported target if we have both set CMAKE_PREFIX_PATH and have not
+# given the NO_CMAKE_PATH option
+unset(CMAKE_PREFIX_PATH)
+unset(ENV{CMAKE_PREFIX_PATH})
+pkg_check_modules(FakePackage1 QUIET IMPORTED_TARGET cmakeinternalfakepackage1)
+if (TARGET PkgConfig::FakePackage1)
+ message(FATAL_ERROR "Have import target for fake package 1 with no path prefix")
+endif()
+
+set(CMAKE_PREFIX_PATH ${fakePkgDir})
+pkg_check_modules(FakePackage1 QUIET IMPORTED_TARGET NO_CMAKE_PATH cmakeinternalfakepackage1)
+if (TARGET PkgConfig::FakePackage1)
+ message(FATAL_ERROR "Have import target for fake package 1 with ignored cmake path")
+endif()
+
+pkg_check_modules(FakePackage1 REQUIRED QUIET IMPORTED_TARGET cmakeinternalfakepackage1)
+if (NOT TARGET PkgConfig::FakePackage1)
+ message(FATAL_ERROR "No import target for fake package 1 with prefix path")
+endif()
+
+# And now do the same for the NO_CMAKE_ENVIRONMENT_PATH - ENV{CMAKE_PREFIX_PATH}
+# combination
+unset(CMAKE_PREFIX_PATH)
+unset(ENV{CMAKE_PREFIX_PATH})
+pkg_check_modules(FakePackage2 QUIET IMPORTED_TARGET cmakeinternalfakepackage2)
+if (TARGET PkgConfig::FakePackage2)
+ message(FATAL_ERROR "Have import target for fake package 2 with no path prefix")
+endif()
+
+set(ENV{CMAKE_PREFIX_PATH} ${fakePkgDir})
+pkg_check_modules(FakePackage2 QUIET IMPORTED_TARGET NO_CMAKE_ENVIRONMENT_PATH cmakeinternalfakepackage2)
+if (TARGET PkgConfig::FakePackage2)
+ message(FATAL_ERROR "Have import target for fake package 2 with ignored cmake path")
+endif()
+
+pkg_check_modules(FakePackage2 REQUIRED QUIET IMPORTED_TARGET cmakeinternalfakepackage2)
+if (NOT TARGET PkgConfig::FakePackage2)
+ message(FATAL_ERROR "No import target for fake package 2 with prefix path")
+endif()

11
cmake-3.10.3-SHA-256.txt
View File

@ -1,11 +0,0 @@
c0fac18cee8c15d04812740fe70f454f0a6b42d374b6908cf0ceb4bf2fcdcaf8 cmake-3.10.3-Darwin-x86_64.dmg
e88d31a5200274407b7ea83cb2195ffc18cd6ceb1278b36c0501be6a118039a8 cmake-3.10.3-Darwin-x86_64.tar.gz
3973fd56fd993bcbeb629841d84e9540118f015089d6b15591ddbba8d95ee3e3 cmake-3.10.3-Linux-x86_64.sh
9e7c48b797484f74c5ee3ae55132b40b16ed8e81ee762402da8971205b0a896b cmake-3.10.3-Linux-x86_64.tar.gz
8ca3a659fb4eac567dc0b62f4315c0a23f65e15c337a54c12176df81ad86655c cmake-3.10.3-win32-x86.msi
edbbfb7f6f4e4f913de4a16d228cf6156ac7071596b6d25f2891a60a006735ea cmake-3.10.3-win32-x86.zip
0426c9509099dd7e2341443a5121a452c96d94466747383f1727d8c58af03df3 cmake-3.10.3-win64-x64.msi
3bd57d1cfcf720a4cc72db77bda4c76a7b700fb0341821ad868963ad28856cd0 cmake-3.10.3-win64-x64.zip
bd1d6e3649c367893e38958ae17d342707086bc694ec038b34b7c6fe303be5b6 cmake-3.10.3.tar.Z
0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8 cmake-3.10.3.tar.gz
01d564ea7558910ed1e5575b772c595a003dd3ad58f11dae4cbb34121f4b2793 cmake-3.10.3.zip

16
cmake-3.10.3-SHA-256.txt.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlqrutkACgkQLSzvEDSS
FoT30g//dWKe0WRIpbHku+GVOY23a278rIgPvvLf1Cz7cHAsJ0ic2sJgrkhaj/gW
eTEAPci1F+7YiC7DXH7e/u1d0va+OIqeuAjgrUqXcHeINMMgg4t8X1lOmQ2Sg9eo
a5yFO9rgZLVVUEccioaWey6bhfWdpswXCG4E2Fqfwf1lutmtrYYrk8Pc2CrEg+x0
811vpSEtvtmmj+x9t6gjgn6StbCQg7DaOWyC11xzFYhUO5wRZfVxBTcpHD8mPIAo
xk7GX7DuxKO4XHcW5EOG31TIDxNz5w4bcPVxOxXvu7k7boveh5IctaD/ahgl3i0O
bbnX/kr5Y90GE15L+v5N1eqy2AICjLD8vIGrRUu7+eNyRoNl7NE0TEwWu1gCKBJF
kPlnfI+z0HSNQLzOTBSIbd9qLUPFPORpT2NN+pEn++ek7KGQD86BKMogOQdLS0x1
IEWiclcyVLVnokdVmQLweX8oM3vD/79EK5DVC1Vtf7P2BSlccv541qRS9tCwQWxS
jCrEJ4ghmX7oYMLDqdnR0BG57d98QoiZYWTuc1lePqaDWgbrahea9k21ABD0kER4
3HPEgqoNt8wfpMIULYV1LLc8waVFK7WoI1in5c9attV3FV3KV9yN3Knri6IKGPkP
E9gBSG6lcUqH0iHzCbXIkBbhesHSAjgv63xZU4EEOvf89bdSO4Y=
=EHvj
-----END PGP SIGNATURE-----

3
cmake-3.10.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8
size 7825559

11
cmake-3.11.0-SHA-256.txt Normal file
View File

@ -0,0 +1,11 @@
e07f5572059ac2bad8c80f7820a84fb715b6fdf03df9e2a38b534f8fcb1864c2 cmake-3.11.0-Darwin-x86_64.dmg
1ea5e27da42817ed80f4bc99bff36acc364420579f6e6d3e59ef5906c67a8286 cmake-3.11.0-Darwin-x86_64.tar.gz
99ef2155cdbfd9cc8fa58a465b928ec64f97b12ae5fecd97426032a748b33788 cmake-3.11.0-Linux-x86_64.sh
5babc7953b50715028a05823d18fd91b62805b10aa7811e5fd02b27224d60f10 cmake-3.11.0-Linux-x86_64.tar.gz
4eb11bc4b08585468a50115b9e3058db4c5574a442fb8b68ddcd7d86c0c7e381 cmake-3.11.0-win32-x86.msi
c473db9e18c1f27024820df917aa2d9d460f69d4cb0305fbf5da7f96ce99754c cmake-3.11.0-win32-x86.zip
39c462f5de6d4a70960c5aa26b847d42107dab77a055f74dc8b2c5cf69a7f487 cmake-3.11.0-win64-x64.msi
e776f4d310b8bc144ab66c3365bfbbd1dcfaad23a13ed0d4929a88a3f4b2bb62 cmake-3.11.0-win64-x64.zip
3d8185ff93fbfbebc2875d8f9566ea5734d10e1e37db14b356915bc0d346f6b1 cmake-3.11.0.tar.Z
c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b cmake-3.11.0.tar.gz
6b250f1ffc2e27545b715512e6ef3d1d99139763b1721c961f1599906288fc08 cmake-3.11.0.zip

16
cmake-3.11.0-SHA-256.txt.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlq7kfcACgkQLSzvEDSS
FoQt0g/+NB3ZeiPo1HCT7IKm7ur5TqAvHi/IBzOi4Qw3HopgrYCQGCsHsBbDJuLV
+mfY8Bi4uaiKR5oLrK4bY1K+OOXMELNx9B41grOlB73d+YQj5kP8mXgAai02OvEh
aIESYLTpnAMu1Ur+KCIYCJhPeUmsgQdDnTWqSdyMw7HcqdFkbvKBEED3hgHFEg5h
8PrkTSk+cRV6z4fSk6F4dMfn3NYUfWuYAgEx1vt1+EMeIxHy48Hj05hJQQTtcw1o
r5bUweVR5dDT5g1SFGQDOSVI5HYQhO4U9Oe5EkwcznKA2+IPnyO4L48v+OocqXow
RrhYsuu9LatcuXioDUH6/lnkmdQHRnqMPoyrdYoE0+1wDXtTwR0oNO9qgwalSNXQ
zKSkmGWzOZAd+fiuHpmCfBasFtCl8ovLJRrBWGGlZcLVlznznb8CAkt0LjetziaD
UCcfajkuNsEMGf3wERwdBy+trC8f2lyWYb0idcx2REsa1P/6wC6VbWIna2l80QMZ
uoBDmJCqBXE1soNtX5qkvblsDVcNgPvY5uEhn/qVg+FpXaW9BWkXwbd4mP3//4ho
h8AdNYLSoXD0f0rV8TkWCuJTlQgH+QoJpVMnaEZwrGxloI+fXnYY5sPVph7Joata
3LI3stnnG4g3+v5kSDjaFUnk8DdOH96xcqyDaHgsDQ7W1IHT0Bk=
=SVll
-----END PGP SIGNATURE-----

3
cmake-3.11.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b
size 7948287

7
cmake-gui.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 28 22:41:54 UTC 2018 - foss@grueninger.de
- Updateo to 3.11.0
* No changes specific to CMake-GUI
- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream
-------------------------------------------------------------------
Fri Mar 16 19:05:39 UTC 2018 - avindra@opensuse.org

4
cmake-gui.spec
View File

@ -16,9 +16,9 @@
#
%define shortversion 3.10
%define shortversion 3.11
Name: cmake-gui
Version: 3.10.3
Version: 3.11.0
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause

16
cmake.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Mar 28 22:27:12 UTC 2018 - foss@grueninger.de
- Updated to 3.11.0
* The Makefile Generators and the Ninja generator learned to add
compiler launcher tools
* The COMPILE_DEFINITIONS source file property learned to support
generator expressions.
* COMPILE_OPTIONS source file property was added to manage list
of options to pass to the compiler.
* A new FetchContent module was added which supports populating
content at configure time using any of the download/update
methods supported by ExternalProject_Add().
full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html
- Adapted form.patch and c17-default.patch
-------------------------------------------------------------------
Fri Mar 16 19:06:10 UTC 2018 - avindra@opensuse.org

5
cmake.spec
View File

@ -16,9 +16,9 @@
#
%define shortversion 3.10
%define shortversion 3.11
Name: cmake
Version: 3.10.3
Version: 3.11.0
Release: 0
Summary: Cross-platform, open-source make system
License: BSD-3-Clause
@ -37,7 +37,6 @@ Patch2: cmake-fix-ruby-test.patch
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
Patch6: cmake-3.10.1_boost-1.66.patch
# Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
Patch7: feature-suse-python-interp-search-order.patch
Patch8: c17-default.patch

2
form.patch
View File

@ -3,7 +3,7 @@ index 7d4e88c..0cc5357 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -17,7 +17,7 @@
CursesDialog/ccmake
CursesDialog/ccmake.cxx
)
-include_directories(${CURSES_INCLUDE_PATH})