diff options
author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-15 21:43:57 +0000 |
---|---|---|
committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-15 21:43:57 +0000 |
commit | 29caeeebb58c3224b7a8244f21b00bfac0698f29 (patch) | |
tree | b961581aa2973465a1fd8e0aa4b1d607ca42d963 /devel/cmake | |
parent | d1fcfca6c9674cd6dc7993c6cd61f26820f16155 (diff) | |
download | ports-29caeeebb58c3224b7a8244f21b00bfac0698f29.tar.gz ports-29caeeebb58c3224b7a8244f21b00bfac0698f29.zip |
Notes
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/Makefile | 4 | ||||
-rw-r--r-- | devel/cmake/distinfo | 6 | ||||
-rw-r--r-- | devel/cmake/files/InitialCache.cmake | 8 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindBLAS.cmake | 34 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindImageMagick.cmake | 38 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindOpenMP.cmake | 16 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 48 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindwxWidgets.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindwxWindows.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-git_3f4924-boost_1.66 | 251 | ||||
-rw-r--r-- | devel/cmake/pkg-plist | 35 |
11 files changed, 115 insertions, 347 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index e98c4807a440..7d9a27f83e3b 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -3,7 +3,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. -DISTVERSION= 3.10.2 +DISTVERSION= 3.11.0 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ @@ -19,7 +19,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libuv.so:devel/libuv \ librhash.so:security/rhash -USES= compiler:c++11-lang libarchive ncurses +USES= compiler:c++11-lang ncurses HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index e805ca0c59ca..a38f48a4fb86 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516374700 -SHA256 (cmake-3.10.2.tar.gz) = 80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b -SIZE (cmake-3.10.2.tar.gz) = 7824452 +TIMESTAMP = 1522528039 +SHA256 (cmake-3.11.0.tar.gz) = c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b +SIZE (cmake-3.11.0.tar.gz) = 7948287 diff --git a/devel/cmake/files/InitialCache.cmake b/devel/cmake/files/InitialCache.cmake index b2805de71212..d63c70479d4d 100644 --- a/devel/cmake/files/InitialCache.cmake +++ b/devel/cmake/files/InitialCache.cmake @@ -13,7 +13,13 @@ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH "Directory where LibLZMA headers are located.") set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH - "LibLZMA library to link against..") + "LibLZMA library to link against.") + +# Similarly for libarchive +set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH + "Directory where LibArchive headers are located.") +set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH + "LibArchive library to link against.") # Modern FreeBSD systems are assumed to have libpkg installed, # so enable its use in CPack for the direct generation of FreeBSD diff --git a/devel/cmake/files/patch-Modules_FindBLAS.cmake b/devel/cmake/files/patch-Modules_FindBLAS.cmake new file mode 100644 index 000000000000..5869baf8bb54 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindBLAS.cmake @@ -0,0 +1,34 @@ +When finding BLAS, we may need to explicitly add gcc_s from the correct +gcc directory to the libraries linked in while testing for BLAS functions. +Check for the necessity via some ldd trickery. PR 226959. + +--- Modules/FindBLAS.cmake.orig 2018-04-06 14:25:24.441628000 +0200 ++++ Modules/FindBLAS.cmake 2018-04-06 15:24:27.515872000 +0200 +@@ -162,6 +162,27 @@ + else() + check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS) + endif() ++ if (NOT ${_prefix}${_combined_name}_WORKS) ++ # On FreeBSD, we may need to link to gcc_s in a special way ++ execute_process( ++ COMMAND /usr/bin/ldd ${${LIBRARIES}} ++ COMMAND /usr/bin/grep gcc_s ++ COMMAND /usr/bin/cut -w -f 4 ++ RESULT_VARIABLE _found_needed ++ OUTPUT_VARIABLE _output_needed ++ ) ++# message("DEBUG: found=${_found_needed} output=${_output_needed}") ++ if (_found_needed EQUAL "0" AND _output_needed MATCHES "libgcc_s") ++ set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_output_needed} ${_thread}) ++ message(STATUS "Re-trying ${LIBRARIES} search with gcc_s") ++ if (CMAKE_Fortran_COMPILER_LOADED) ++ check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS2) ++ else() ++ check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS2) ++ endif() ++ set(${_prefix}${_combined_name}_WORKS ${${_prefix}${_combined_name}_WORKS2}) ++ endif() ++ endif() + set(CMAKE_REQUIRED_LIBRARIES) + mark_as_advanced(${_prefix}${_combined_name}_WORKS) + set(_libraries_work ${${_prefix}${_combined_name}_WORKS}) diff --git a/devel/cmake/files/patch-Modules_FindImageMagick.cmake b/devel/cmake/files/patch-Modules_FindImageMagick.cmake deleted file mode 100644 index 29749b313d9f..000000000000 --- a/devel/cmake/files/patch-Modules_FindImageMagick.cmake +++ /dev/null @@ -1,38 +0,0 @@ -Insert an additional search item when finding ImageMagick, originally -from kwm (see below), adjusted for new organization of search paths. - -Author: kwm <kwm@FreeBSD.org> -Date: Sun Jan 18 21:12:42 2015 +0000 - - Update ImageMagick to 6.9.0.4. - - - Normalize the ImageMagick library name so it stays the same regardless of - what the 16-bit and HDRI option are set to [1]. Teach cmake to look for - the new name. Bump ports that link to the libraries due to this. - ---- Modules/FindImageMagick.cmake.orig 2017-07-27 18:33:53.634381000 +0200 -+++ Modules/FindImageMagick.cmake 2017-07-27 18:36:31.110708000 +0200 -@@ -196,6 +196,7 @@ - if(component STREQUAL "Magick++") - FIND_IMAGEMAGICK_API(Magick++ Magick++.h - Magick++ CORE_RL_Magick++_ -+ Magick++-6 - Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI - Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI - Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI -@@ -204,6 +205,7 @@ - elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h" - Wand MagickWand CORE_RL_wand_ -+ MagickWand-6 - MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI - MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI - MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI -@@ -212,6 +214,7 @@ - elseif(component STREQUAL "MagickCore") - FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h" - Magick MagickCore CORE_RL_magick_ -+ MagickCore-6 - MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI - MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI - MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI diff --git a/devel/cmake/files/patch-Modules_FindOpenMP.cmake b/devel/cmake/files/patch-Modules_FindOpenMP.cmake new file mode 100644 index 000000000000..68726ea95fe3 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindOpenMP.cmake @@ -0,0 +1,16 @@ +Avoid looking for pthread by simply asserting that it is there. +Otherwise openmp can't be found because the pthread library +lives in /usr/lib and CMake 3.11 doesn't look there anymore +while looking for openmp. PR 223678. + +--- Modules/FindOpenMP.cmake 2018-04-07 20:56:40.059488000 +0000 ++++ Modules/FindOpenMP.cmake 2018-04-07 21:48:55.681077000 +0000 +@@ -79,6 +79,8 @@ + cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced + cmake_policy(SET CMP0057 NEW) # if IN_LIST + ++set(OpenMP_pthread_LIBRARY -lpthread) ++ + function(_OPENMP_FLAG_CANDIDATES LANG) + message(STATUS "FindOpenMP: flag-candidates ${LANG}") + if(NOT OpenMP_${LANG}_FLAG) diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index bfdf9a57e651..f3cd418a8a96 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,36 +1,30 @@ ---- Modules/FindQt4.cmake.orig 2017-05-31 14:00:09 UTC +--- Modules/FindQt4.cmake.orig 2018-03-28 11:16:49 UTC +++ Modules/FindQt4.cmake -@@ -706,14 +706,7 @@ if (QT_QMAKE_EXECUTABLE AND - # ask qmake for the plugins directory - if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) - _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir) -- set(QT_PLUGINS_DIR NOTFOUND) -- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) -- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins") -- endforeach() +@@ -713,10 +713,15 @@ if (QT_QMAKE_EXECUTABLE AND + foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) + set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins") + endforeach() - find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer -- HINTS ${qt_cross_paths} ${qt_plugins_dir} -- DOC "The location of the Qt plugins" ++ find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs + HINTS ${qt_cross_paths} ${qt_plugins_dir} + DOC "The location of the Qt plugins" - NO_CMAKE_FIND_ROOT_PATH) -+ set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE) ++ NO_CMAKE_FIND_ROOT_PATH ++ NO_SYSTEM_ENVIRONMENT_PATH ++ NO_CMAKE_SYSTEM_PATH) ++ if(NOT QT_PLUGINS_DIR AND qt_plugins_dir) ++ set(QT_PLUGINS_DIR ${qt_plugins_dir}) ++ endif() endif () # ask qmake for the translations directory -@@ -726,16 +719,7 @@ if (QT_QMAKE_EXECUTABLE AND - if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) - _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) - if(qt_imports_dir) -- set(QT_IMPORTS_DIR NOTFOUND) -- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) -- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") -- endforeach() -- find_path(QT_IMPORTS_DIR NAMES Qt -- HINTS ${qt_cross_paths} ${qt_imports_dir} -- DOC "The location of the Qt imports" -- NO_CMAKE_FIND_ROOT_PATH -- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH -- NO_CMAKE_SYSTEM_PATH) -+ set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE) +@@ -740,6 +745,9 @@ if (QT_QMAKE_EXECUTABLE AND + NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH) mark_as_advanced(QT_IMPORTS_DIR) ++ if(NOT QT_IMPORTS_DIR AND qt_imports_dir) ++ set(QT_IMPORTS_DIR ${qt_imports_dir}) ++ endif() endif() endif () + diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake deleted file mode 100644 index d270d6eb5642..000000000000 --- a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindwxWidgets.cmake.orig 2017-05-31 14:00:09 UTC -+++ Modules/FindwxWidgets.cmake -@@ -747,7 +747,7 @@ else() - #----------------------------------------------------------------- - # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE -- NAMES wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 -+ NAMES $ENV{WX_CONFIG} wx-config-3.1 wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8 - DOC "Location of wxWidgets library configuration provider binary (wx-config)." - ONLY_CMAKE_FIND_ROOT_PATH - ) diff --git a/devel/cmake/files/patch-Modules_FindwxWindows.cmake b/devel/cmake/files/patch-Modules_FindwxWindows.cmake deleted file mode 100644 index b2a967ec0d93..000000000000 --- a/devel/cmake/files/patch-Modules_FindwxWindows.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindwxWindows.cmake.orig 2017-05-31 14:00:09 UTC -+++ Modules/FindwxWindows.cmake -@@ -617,7 +617,7 @@ else() - - # wx-config should be in your path anyhow, usually no need to set WXWIN or - # search in ../wx or ../../wx -- find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config -+ find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config - HINTS - ENV WXWIN - $ENV{WXWIN}/bin diff --git a/devel/cmake/files/patch-git_3f4924-boost_1.66 b/devel/cmake/files/patch-git_3f4924-boost_1.66 deleted file mode 100644 index adf88a2ba198..000000000000 --- a/devel/cmake/files/patch-git_3f4924-boost_1.66 +++ /dev/null @@ -1,251 +0,0 @@ -From 433a2d495a2481c63b82c11a30f7c642d6abe63f Mon Sep 17 00:00:00 2001 -From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> -Date: Fri, 29 Dec 2017 19:55:49 +1100 -Subject: [PATCH 1/5] FindBoost: Boost 1.66.0 dependency and release update - -Release notes: http://www.boost.org/users/history/version_1_66_0.html - -* All new libraries are header-only. -* _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1 -* _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0 ---- - Modules/FindBoost.cmake | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index a0fd90f771a..6434dcb7dbb 100644 ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -791,7 +791,7 @@ 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() -@@ -925,8 +925,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 -@@ -1032,7 +1032,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.66.0" "1.66" "1.65.1" "1.65.0" "1.65" - "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" - -From b1e9f67137733bc109d355450fcd06edda4784c5 Mon Sep 17 00:00:00 2001 -From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> -Date: Fri, 29 Dec 2017 20:07:31 +1100 -Subject: [PATCH 2/5] FindBoost: Fix incorrect alphabetisation of headers list - ---- - Modules/FindBoost.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 6434dcb7dbb..734a93cca65 100644 ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -825,8 +825,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") - -From b044f69a413123f15a05034c00a8e3763764a1e5 Mon Sep 17 00:00:00 2001 -From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> -Date: Fri, 29 Dec 2017 21:50:54 +1100 -Subject: [PATCH 3/5] FindBoost: Implement "Architecture and Address Model" tag - -This tag is new in Boost 1.66.0, and is present in the 'versioned' -library file name layout. ---- - Modules/FindBoost.cmake | 52 +++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 42 insertions(+), 10 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 734a93cca65..4b34802fca3 100644 ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -1379,8 +1379,11 @@ if(Boost_DEBUG) - endif() - - #====================== --# Systematically build up the Boost ABI tag --# http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming -+# Systematically build up the Boost ABI tag for the 'tagged' and 'versioned' layouts -+# http://boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming -+# http://boost.org/doc/libs/1_66_0/boost/config/auto_link.hpp -+# http://boost.org/doc/libs/1_66_0/tools/build/src/tools/common.jam -+# http://boost.org/doc/libs/1_66_0/boostcpp.jam - set( _boost_RELEASE_ABI_TAG "-") - set( _boost_DEBUG_ABI_TAG "-") - # Key Use this library when: -@@ -1412,11 +1415,40 @@ if(Boost_USE_STLPORT) - string(APPEND _boost_DEBUG_ABI_TAG "p") - endif() - # n using the STLport deprecated "native iostreams" feature -+# removed from the documentation in 1.43.0 but still present in -+# boost/config/auto_link.hpp - if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS) - string(APPEND _boost_RELEASE_ABI_TAG "n") - string(APPEND _boost_DEBUG_ABI_TAG "n") - endif() - -+# -x86 Architecture and address model tag -+# First character is the architecture, then word-size, either 32 or 64 -+# Only used in 'versioned' layout, added in Boost 1.66.0 -+set(_boost_ARCHITECTURE_TAG "") -+# {CMAKE_CXX_COMPILER_ARCHITECTURE_ID} is not currently set for all compilers -+if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600) -+ string(APPEND _boost_ARCHITECTURE_TAG "-") -+ # This needs to be kept in-sync with the section of CMakePlatformId.h.in -+ # inside 'defined(_WIN32) && defined(_MSC_VER)' -+ if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64") -+ string(APPEND _boost_ARCHITECTURE_TAG "i") -+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86" -+ OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64") -+ string(APPEND _boost_ARCHITECTURE_TAG "x") -+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM") -+ string(APPEND _boost_ARCHITECTURE_TAG "a") -+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS") -+ string(APPEND _boost_ARCHITECTURE_TAG "m") -+ endif() -+ -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) -+ string(APPEND _boost_ARCHITECTURE_TAG "64") -+ else() -+ string(APPEND _boost_ARCHITECTURE_TAG "32") -+ endif() -+endif() -+ - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}") -@@ -1610,22 +1642,22 @@ 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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) - if(_boost_STATIC_RUNTIME_WORKAROUND) - 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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") -@@ -1660,11 +1692,11 @@ 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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -@@ -1672,11 +1704,11 @@ 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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_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}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - -From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001 -From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> -Date: Fri, 29 Dec 2017 22:38:36 +1100 -Subject: [PATCH 4/5] FindBoost: Search for upstream-packaged libs next to - includes - -Upstream packages Boost binaries for Windows with the 'boost' directory -(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR). ---- - Modules/FindBoost.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 4b34802fca3..479c83115c9 100644 ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -1496,6 +1496,7 @@ foreach(c DEBUG RELEASE) - ${Boost_INCLUDE_DIR}/stage/lib - ) - _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..") -+ _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}") - if( Boost_NO_SYSTEM_PATHS ) - list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) - else() - -From 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0 Mon Sep 17 00:00:00 2001 -From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> -Date: Sat, 30 Dec 2017 16:00:29 +1100 -Subject: [PATCH 5/5] FindBoost: Generate imported targets for future Boost - versions - -Per discussion on cmake/cmake#17575, this protection not particularly -valuable, as the dependency information which the imported targets wrap -is generated anyway. - -This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to -support newly-released Boost versions pending a new CMake release. ---- - Modules/FindBoost.cmake | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 479c83115c9..ca2a9c5b358 100644 ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -793,7 +793,6 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - endif() - 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() - diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 1b3dd4e195ba..387cf9a762ad 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -173,7 +173,6 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/generator/CodeLite.rst %%DATADIR%%/Help/generator/Eclipse CDT4.rst %%DATADIR%%/Help/generator/Green Hills MULTI.rst -%%DATADIR%%/Help/generator/KDevelop3.rst %%DATADIR%%/Help/generator/Kate.rst %%DATADIR%%/Help/generator/MSYS Makefiles.rst %%DATADIR%%/Help/generator/MinGW Makefiles.rst @@ -289,6 +288,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/module/ExternalData.rst %%DATADIR%%/Help/module/ExternalProject.rst %%DATADIR%%/Help/module/FeatureSummary.rst +%%DATADIR%%/Help/module/FetchContent.rst %%DATADIR%%/Help/module/FindALSA.rst %%DATADIR%%/Help/module/FindASPELL.rst %%DATADIR%%/Help/module/FindAVIFile.rst @@ -337,6 +337,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/module/FindICU.rst %%DATADIR%%/Help/module/FindITK.rst %%DATADIR%%/Help/module/FindIce.rst +%%DATADIR%%/Help/module/FindIconv.rst %%DATADIR%%/Help/module/FindIcotool.rst %%DATADIR%%/Help/module/FindImageMagick.rst %%DATADIR%%/Help/module/FindIntl.rst @@ -537,6 +538,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/policy/CMP0069.rst %%DATADIR%%/Help/policy/CMP0070.rst %%DATADIR%%/Help/policy/CMP0071.rst +%%DATADIR%%/Help/policy/CMP0072.rst %%DATADIR%%/Help/policy/DEPRECATED.txt %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt %%DATADIR%%/Help/prop_cache/ADVANCED.rst @@ -624,10 +626,12 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS.rst %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst %%DATADIR%%/Help/prop_sf/COMPILE_FLAGS.rst +%%DATADIR%%/Help/prop_sf/COMPILE_OPTIONS.rst %%DATADIR%%/Help/prop_sf/EXTERNAL_OBJECT.rst %%DATADIR%%/Help/prop_sf/Fortran_FORMAT.rst %%DATADIR%%/Help/prop_sf/GENERATED.rst %%DATADIR%%/Help/prop_sf/HEADER_FILE_ONLY.rst +%%DATADIR%%/Help/prop_sf/INCLUDE_DIRECTORIES.rst %%DATADIR%%/Help/prop_sf/KEEP_EXTENSION.rst %%DATADIR%%/Help/prop_sf/LABELS.rst %%DATADIR%%/Help/prop_sf/LANGUAGE.rst @@ -646,6 +650,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst %%DATADIR%%/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst %%DATADIR%%/Help/prop_sf/VS_RESOURCE_GENERATOR.rst +%%DATADIR%%/Help/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst +%%DATADIR%%/Help/prop_sf/VS_SHADER_ENABLE_DEBUG.rst %%DATADIR%%/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst %%DATADIR%%/Help/prop_sf/VS_SHADER_FLAGS.rst %%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst @@ -703,6 +709,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst %%DATADIR%%/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst +%%DATADIR%%/Help/prop_tgt/AUTOGEN_PARALLEL.rst %%DATADIR%%/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst %%DATADIR%%/Help/prop_tgt/AUTOMOC.rst %%DATADIR%%/Help/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst @@ -769,6 +776,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst %%DATADIR%%/Help/prop_tgt/IMPORTED.rst %%DATADIR%%/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst +%%DATADIR%%/Help/prop_tgt/IMPORTED_GLOBAL.rst %%DATADIR%%/Help/prop_tgt/IMPORTED_IMPLIB.rst %%DATADIR%%/Help/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst %%DATADIR%%/Help/prop_tgt/IMPORTED_LIBNAME.rst @@ -916,6 +924,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/release/3.0.rst %%DATADIR%%/Help/release/3.1.rst %%DATADIR%%/Help/release/3.10.rst +%%DATADIR%%/Help/release/3.11.rst %%DATADIR%%/Help/release/3.2.rst %%DATADIR%%/Help/release/3.3.rst %%DATADIR%%/Help/release/3.4.rst @@ -962,6 +971,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_ARGC.rst %%DATADIR%%/Help/variable/CMAKE_ARGV0.rst +%%DATADIR%%/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst %%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst @@ -986,6 +996,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst %%DATADIR%%/Help/variable/CMAKE_CFG_INTDIR.rst %%DATADIR%%/Help/variable/CMAKE_CL_64.rst +%%DATADIR%%/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst %%DATADIR%%/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst %%DATADIR%%/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst %%DATADIR%%/Help/variable/CMAKE_COLOR_MAKEFILE.rst @@ -1003,6 +1014,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_EXTENSIONS.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst +%%DATADIR%%/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_STANDARD.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst @@ -1067,6 +1079,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR.rst +%%DATADIR%%/Help/variable/CMAKE_GENERATOR_INSTANCE.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR_PLATFORM.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR_TOOLSET.rst %%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst @@ -1088,6 +1101,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst %%DATADIR%%/Help/variable/CMAKE_INCLUDE_PATH.rst %%DATADIR%%/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst +%%DATADIR%%/Help/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst %%DATADIR%%/Help/variable/CMAKE_INSTALL_MESSAGE.rst %%DATADIR%%/Help/variable/CMAKE_INSTALL_NAME_DIR.rst %%DATADIR%%/Help/variable/CMAKE_INSTALL_PREFIX.rst @@ -1098,6 +1112,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst %%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst +%%DATADIR%%/Help/variable/CMAKE_JOB_POOLS.rst %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst %%DATADIR%%/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst @@ -1127,6 +1142,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst %%DATADIR%%/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS.rst +%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst +%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_INIT.rst @@ -1136,6 +1153,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst +%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst %%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst %%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst @@ -1190,6 +1208,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst %%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst %%DATADIR%%/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst +%%DATADIR%%/Help/variable/CMAKE_NETRC.rst +%%DATADIR%%/Help/variable/CMAKE_NETRC_FILE.rst %%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst %%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst %%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst @@ -1283,11 +1303,13 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst %%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst %%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst +%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst %%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst %%DATADIR%%/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst %%DATADIR%%/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst +%%DATADIR%%/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst %%DATADIR%%/Help/variable/CPACK_INSTALL_SCRIPT.rst %%DATADIR%%/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst %%DATADIR%%/Help/variable/CPACK_SET_DESTDIR.rst @@ -1349,6 +1371,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CTEST_P4_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_P4_OPTIONS.rst %%DATADIR%%/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst +%%DATADIR%%/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst %%DATADIR%%/Help/variable/CTEST_SCP_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_SITE.rst %%DATADIR%%/Help/variable/CTEST_SOURCE_DIRECTORY.rst @@ -1406,10 +1429,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/AddFileDependencies.cmake %%DATADIR%%/Modules/AndroidTestUtilities.cmake %%DATADIR%%/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake -%%DATADIR%%/Modules/AutogenInfo.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in +%%DATADIR%%/Modules/BasicConfigVersion-SameMinorVersion.cmake.in %%DATADIR%%/Modules/BundleUtilities.cmake %%DATADIR%%/Modules/CMake.cmake %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake @@ -1473,9 +1496,9 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/CMakeFindEclipseCDT4.cmake %%DATADIR%%/Modules/CMakeFindFrameworks.cmake %%DATADIR%%/Modules/CMakeFindJavaCommon.cmake -%%DATADIR%%/Modules/CMakeFindKDevelop3.cmake %%DATADIR%%/Modules/CMakeFindKate.cmake %%DATADIR%%/Modules/CMakeFindPackageMode.cmake +%%DATADIR%%/Modules/CMakeFindSublimeText2.cmake %%DATADIR%%/Modules/CMakeFindWMake.cmake %%DATADIR%%/Modules/CMakeFindXCode.cmake %%DATADIR%%/Modules/CMakeForceCompiler.cmake @@ -1487,6 +1510,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/CMakeGraphVizOptions.cmake %%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake +%%DATADIR%%/Modules/CMakeInitializeConfigs.cmake %%DATADIR%%/Modules/CMakeJOMFindMake.cmake %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in %%DATADIR%%/Modules/CMakeJavaInformation.cmake @@ -1697,6 +1721,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake %%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake +%%DATADIR%%/Modules/Compiler/MSVC-ASM.cmake %%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake %%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake @@ -1771,6 +1796,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/ExternalProject.cmake %%DATADIR%%/Modules/FLTKCompatibility.cmake %%DATADIR%%/Modules/FeatureSummary.cmake +%%DATADIR%%/Modules/FetchContent.cmake +%%DATADIR%%/Modules/FetchContent/CMakeLists.cmake.in %%DATADIR%%/Modules/FindALSA.cmake %%DATADIR%%/Modules/FindASPELL.cmake %%DATADIR%%/Modules/FindAVIFile.cmake @@ -1823,6 +1850,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/FindHg.cmake %%DATADIR%%/Modules/FindICU.cmake %%DATADIR%%/Modules/FindIce.cmake +%%DATADIR%%/Modules/FindIconv.cmake %%DATADIR%%/Modules/FindIcotool.cmake %%DATADIR%%/Modules/FindImageMagick.cmake %%DATADIR%%/Modules/FindIntl.cmake @@ -2206,6 +2234,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake %%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake %%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake +%%DATADIR%%/Modules/Platform/Windows-Flang-Fortran.cmake %%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake %%DATADIR%%/Modules/Platform/Windows-GNU-C-ABI.cmake %%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake |