Attachment #199698 for bug #233411

Lines 1-7 Link Here

(-)b/devel/cmake-doc/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.12.4	4	DISTVERSION= 3.13.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -doc	7	PKGNAMESUFFIX= -doc

Lines 1-7 Link Here

(-)b/devel/cmake-gui/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.12.4	4	DISTVERSION= 3.13.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -gui	7	PKGNAMESUFFIX= -gui
Lines 26-32 CMAKE_OFF= BUILD_CursesDialog \ Link Here
26	CMake_SPHINX_DEPEND_ON_EXECUTABLES	26	CMake_SPHINX_DEPEND_ON_EXECUTABLES
27	CMAKE_ON= BUILD_QtDialog \	27	CMAKE_ON= BUILD_QtDialog \
28	CMAKE_USE_SYSTEM_LIBRARIES \	28	CMAKE_USE_SYSTEM_LIBRARIES \
29	SPHINX_MAN	29	SPHINX_MAN
30	CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \	30	CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
31	-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \	31	-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
32		32

Lines 3-10 Link Here

(-)b/devel/cmake/Makefile (-2 / +1 lines)
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.	5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.
6	DISTVERSION= 3.12.4	6	DISTVERSION= 3.13.1
7	PORTREVISION= 2
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	8	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
10		9

Lines 1-3 Link Here

(-)b/devel/cmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1541182860	1	TIMESTAMP = 1543614608
2	SHA256 (cmake-3.12.4.tar.gz) = 5255584bfd043eb717562cff8942d472f1c0e4679c4941d84baadaa9b28e3194	2	SHA256 (cmake-3.13.1.tar.gz) = befe1ce6d672f2881350e94d4e3cc809697dd2c09e5b708b76c1dae74e1b2210
3	SIZE (cmake-3.12.4.tar.gz) = 8388984	3	SIZE (cmake-3.13.1.tar.gz) = 8614663




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})




--- Modules/GNUInstallDirs.cmake.orig	2018-11-06 09:52:09 UTC
+++ Modules/GNUInstallDirs.cmake
@@ -276,14 +276,12 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "
 _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
   "Read-only architecture-independent data (DATAROOTDIR)")
 
+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
+    "Info documentation (DATAROOTDIR/info)")
 if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
-  _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
-    "Info documentation (info)")
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
     "Man documentation (man)")
 else()
-  _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
-    "Info documentation (DATAROOTDIR/info)")
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man"
     "Man documentation (DATAROOTDIR/man)")
 endif()




From bde3c3043ae2b48f7d62affaf25a4387dea1a22a Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sun, 11 Nov 2018 19:09:57 +0100
Subject: [PATCH] FreeBSD switch the installation location of info files to
 share/info.

---
 Modules/GNUInstallDirs.cmake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git Modules/GNUInstallDirs.cmake Modules/GNUInstallDirs.cmake
index 48d830ff5..c25363287 100644
--- Modules/GNUInstallDirs.cmake
+++ Modules/GNUInstallDirs.cmake
@@ -277,9 +277,14 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
 _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
   "Read-only architecture-independent data (DATAROOTDIR)")
 
-if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
-  _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
-    "Info documentation (info)")
+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
+  if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
+      "Info documentation (DATAROOTDIR/info)")
+  else()
+    _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
+      "Info documentation (info)")
+  endif()
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
     "Man documentation (man)")
 else()
-- 
2.19.1


Lines 22-32 bin/ctest Link Here

(-)b/devel/cmake/pkg-plist (-15 / +99 lines)
22	%%MANPAGES%%man/man7/cmake-server.7.gz	22	%%MANPAGES%%man/man7/cmake-server.7.gz
23	%%MANPAGES%%man/man7/cmake-toolchains.7.gz	23	%%MANPAGES%%man/man7/cmake-toolchains.7.gz
24	%%MANPAGES%%man/man7/cmake-variables.7.gz	24	%%MANPAGES%%man/man7/cmake-variables.7.gz
		25	%%MANPAGES%%man/man7/cpack-generators.7.gz
25	share/aclocal/cmake.m4	26	share/aclocal/cmake.m4
26	%%DATADIR%%/Help/command/COMPILE_OPTIONS_SHELL.txt
27	%%DATADIR%%/Help/command/FIND_XXX.txt	27	%%DATADIR%%/Help/command/FIND_XXX.txt
28	%%DATADIR%%/Help/command/FIND_XXX_ORDER.txt	28	%%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
29	%%DATADIR%%/Help/command/FIND_XXX_ROOT.txt	29	%%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
		30	%%DATADIR%%/Help/command/LINK_OPTIONS_LINKER.txt
		31	%%DATADIR%%/Help/command/OPTIONS_SHELL.txt
30	%%DATADIR%%/Help/command/add_compile_definitions.rst	32	%%DATADIR%%/Help/command/add_compile_definitions.rst
31	%%DATADIR%%/Help/command/add_compile_options.rst	33	%%DATADIR%%/Help/command/add_compile_options.rst
32	%%DATADIR%%/Help/command/add_custom_command.rst	34	%%DATADIR%%/Help/command/add_custom_command.rst
Lines 35-40 share/aclocal/cmake.m4 Link Here
35	%%DATADIR%%/Help/command/add_dependencies.rst	37	%%DATADIR%%/Help/command/add_dependencies.rst
36	%%DATADIR%%/Help/command/add_executable.rst	38	%%DATADIR%%/Help/command/add_executable.rst
37	%%DATADIR%%/Help/command/add_library.rst	39	%%DATADIR%%/Help/command/add_library.rst
		40	%%DATADIR%%/Help/command/add_link_options.rst
38	%%DATADIR%%/Help/command/add_subdirectory.rst	41	%%DATADIR%%/Help/command/add_subdirectory.rst
39	%%DATADIR%%/Help/command/add_test.rst	42	%%DATADIR%%/Help/command/add_test.rst
40	%%DATADIR%%/Help/command/aux_source_directory.rst	43	%%DATADIR%%/Help/command/aux_source_directory.rst
Lines 135-141 share/aclocal/cmake.m4 Link Here
135	%%DATADIR%%/Help/command/target_compile_features.rst	138	%%DATADIR%%/Help/command/target_compile_features.rst
136	%%DATADIR%%/Help/command/target_compile_options.rst	139	%%DATADIR%%/Help/command/target_compile_options.rst
137	%%DATADIR%%/Help/command/target_include_directories.rst	140	%%DATADIR%%/Help/command/target_include_directories.rst
		141	%%DATADIR%%/Help/command/target_link_directories.rst
138	%%DATADIR%%/Help/command/target_link_libraries.rst	142	%%DATADIR%%/Help/command/target_link_libraries.rst
		143	%%DATADIR%%/Help/command/target_link_options.rst
139	%%DATADIR%%/Help/command/target_sources.rst	144	%%DATADIR%%/Help/command/target_sources.rst
140	%%DATADIR%%/Help/command/try_compile.rst	145	%%DATADIR%%/Help/command/try_compile.rst
141	%%DATADIR%%/Help/command/try_run.rst	146	%%DATADIR%%/Help/command/try_run.rst
Lines 146-151 share/aclocal/cmake.m4 Link Here
146	%%DATADIR%%/Help/command/variable_watch.rst	151	%%DATADIR%%/Help/command/variable_watch.rst
147	%%DATADIR%%/Help/command/while.rst	152	%%DATADIR%%/Help/command/while.rst
148	%%DATADIR%%/Help/command/write_file.rst	153	%%DATADIR%%/Help/command/write_file.rst
		154	%%DATADIR%%/Help/cpack_gen/archive.rst
		155	%%DATADIR%%/Help/cpack_gen/bundle.rst
		156	%%DATADIR%%/Help/cpack_gen/cygwin.rst
		157	%%DATADIR%%/Help/cpack_gen/deb.rst
		158	%%DATADIR%%/Help/cpack_gen/dmg.rst
		159	%%DATADIR%%/Help/cpack_gen/external.rst
		160	%%DATADIR%%/Help/cpack_gen/freebsd.rst
		161	%%DATADIR%%/Help/cpack_gen/ifw.rst
		162	%%DATADIR%%/Help/cpack_gen/nsis.rst
		163	%%DATADIR%%/Help/cpack_gen/nuget.rst
		164	%%DATADIR%%/Help/cpack_gen/packagemaker.rst
		165	%%DATADIR%%/Help/cpack_gen/productbuild.rst
		166	%%DATADIR%%/Help/cpack_gen/rpm.rst
		167	%%DATADIR%%/Help/cpack_gen/wix.rst
149	%%DATADIR%%/Help/envvar/ASM_DIALECT.rst	168	%%DATADIR%%/Help/envvar/ASM_DIALECT.rst
150	%%DATADIR%%/Help/envvar/ASM_DIALECTFLAGS.rst	169	%%DATADIR%%/Help/envvar/ASM_DIALECTFLAGS.rst
151	%%DATADIR%%/Help/envvar/CC.rst	170	%%DATADIR%%/Help/envvar/CC.rst
Lines 158-163 share/aclocal/cmake.m4 Link Here
158	%%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst	177	%%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst
159	%%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst	178	%%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst
160	%%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst	179	%%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst
		180	%%DATADIR%%/Help/envvar/CTEST_PROGRESS_OUTPUT.rst
161	%%DATADIR%%/Help/envvar/CTEST_USE_LAUNCHERS_DEFAULT.rst	181	%%DATADIR%%/Help/envvar/CTEST_USE_LAUNCHERS_DEFAULT.rst
162	%%DATADIR%%/Help/envvar/CUDACXX.rst	182	%%DATADIR%%/Help/envvar/CUDACXX.rst
163	%%DATADIR%%/Help/envvar/CUDAFLAGS.rst	183	%%DATADIR%%/Help/envvar/CUDAFLAGS.rst
Lines 224-229 share/aclocal/cmake.m4 Link Here
224	%%DATADIR%%/Help/manual/cmake-toolchains.7.rst	244	%%DATADIR%%/Help/manual/cmake-toolchains.7.rst
225	%%DATADIR%%/Help/manual/cmake-variables.7.rst	245	%%DATADIR%%/Help/manual/cmake-variables.7.rst
226	%%DATADIR%%/Help/manual/cmake.1.rst	246	%%DATADIR%%/Help/manual/cmake.1.rst
		247	%%DATADIR%%/Help/manual/cpack-generators.7.rst
227	%%DATADIR%%/Help/manual/cpack.1.rst	248	%%DATADIR%%/Help/manual/cpack.1.rst
228	%%DATADIR%%/Help/manual/ctest.1.rst	249	%%DATADIR%%/Help/manual/ctest.1.rst
229	%%DATADIR%%/Help/module/AddFileDependencies.rst	250	%%DATADIR%%/Help/module/AddFileDependencies.rst
Lines 552-557 share/aclocal/cmake.m4 Link Here
552	%%DATADIR%%/Help/policy/CMP0073.rst	573	%%DATADIR%%/Help/policy/CMP0073.rst
553	%%DATADIR%%/Help/policy/CMP0074.rst	574	%%DATADIR%%/Help/policy/CMP0074.rst
554	%%DATADIR%%/Help/policy/CMP0075.rst	575	%%DATADIR%%/Help/policy/CMP0075.rst
		576	%%DATADIR%%/Help/policy/CMP0076.rst
		577	%%DATADIR%%/Help/policy/CMP0077.rst
		578	%%DATADIR%%/Help/policy/CMP0078.rst
		579	%%DATADIR%%/Help/policy/CMP0079.rst
		580	%%DATADIR%%/Help/policy/CMP0080.rst
		581	%%DATADIR%%/Help/policy/CMP0081.rst
555	%%DATADIR%%/Help/policy/DEPRECATED.txt	582	%%DATADIR%%/Help/policy/DEPRECATED.txt
556	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt	583	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
557	%%DATADIR%%/Help/prop_cache/ADVANCED.rst	584	%%DATADIR%%/Help/prop_cache/ADVANCED.rst
Lines 578-583 share/aclocal/cmake.m4 Link Here
578	%%DATADIR%%/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst	605	%%DATADIR%%/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
579	%%DATADIR%%/Help/prop_dir/LABELS.rst	606	%%DATADIR%%/Help/prop_dir/LABELS.rst
580	%%DATADIR%%/Help/prop_dir/LINK_DIRECTORIES.rst	607	%%DATADIR%%/Help/prop_dir/LINK_DIRECTORIES.rst
		608	%%DATADIR%%/Help/prop_dir/LINK_OPTIONS.rst
581	%%DATADIR%%/Help/prop_dir/LISTFILE_STACK.rst	609	%%DATADIR%%/Help/prop_dir/LISTFILE_STACK.rst
582	%%DATADIR%%/Help/prop_dir/MACROS.rst	610	%%DATADIR%%/Help/prop_dir/MACROS.rst
583	%%DATADIR%%/Help/prop_dir/PARENT_DIRECTORY.rst	611	%%DATADIR%%/Help/prop_dir/PARENT_DIRECTORY.rst
Lines 776-781 share/aclocal/cmake.m4 Link Here
776	%%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst	804	%%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst
777	%%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst	805	%%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
778	%%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst	806	%%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
		807	%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
779	%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst	808	%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
780	%%DATADIR%%/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst	809	%%DATADIR%%/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
781	%%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst	810	%%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
Lines 830-836 share/aclocal/cmake.m4 Link Here
830	%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst	859	%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
831	%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst	860	%%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
832	%%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst	861	%%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
		862	%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_DEPENDS.rst
		863	%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_DIRECTORIES.rst
833	%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst	864	%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
		865	%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_OPTIONS.rst
834	%%DATADIR%%/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst	866	%%DATADIR%%/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
835	%%DATADIR%%/Help/prop_tgt/INTERFACE_SOURCES.rst	867	%%DATADIR%%/Help/prop_tgt/INTERFACE_SOURCES.rst
836	%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst	868	%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
Lines 853-858 share/aclocal/cmake.m4 Link Here
853	%%DATADIR%%/Help/prop_tgt/LINKER_LANGUAGE.rst	885	%%DATADIR%%/Help/prop_tgt/LINKER_LANGUAGE.rst
854	%%DATADIR%%/Help/prop_tgt/LINK_DEPENDS.rst	886	%%DATADIR%%/Help/prop_tgt/LINK_DEPENDS.rst
855	%%DATADIR%%/Help/prop_tgt/LINK_DEPENDS_NO_SHARED.rst	887	%%DATADIR%%/Help/prop_tgt/LINK_DEPENDS_NO_SHARED.rst
		888	%%DATADIR%%/Help/prop_tgt/LINK_DIRECTORIES.rst
856	%%DATADIR%%/Help/prop_tgt/LINK_FLAGS.rst	889	%%DATADIR%%/Help/prop_tgt/LINK_FLAGS.rst
857	%%DATADIR%%/Help/prop_tgt/LINK_FLAGS_CONFIG.rst	890	%%DATADIR%%/Help/prop_tgt/LINK_FLAGS_CONFIG.rst
858	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst	891	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst
Lines 860-865 share/aclocal/cmake.m4 Link Here
860	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY.rst	893	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY.rst
861	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG.rst	894	%%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG.rst
862	%%DATADIR%%/Help/prop_tgt/LINK_LIBRARIES.rst	895	%%DATADIR%%/Help/prop_tgt/LINK_LIBRARIES.rst
		896	%%DATADIR%%/Help/prop_tgt/LINK_LIBRARIES_INDIRECTION.txt
		897	%%DATADIR%%/Help/prop_tgt/LINK_OPTIONS.rst
863	%%DATADIR%%/Help/prop_tgt/LINK_SEARCH_END_STATIC.rst	898	%%DATADIR%%/Help/prop_tgt/LINK_SEARCH_END_STATIC.rst
864	%%DATADIR%%/Help/prop_tgt/LINK_SEARCH_START_STATIC.rst	899	%%DATADIR%%/Help/prop_tgt/LINK_SEARCH_START_STATIC.rst
865	%%DATADIR%%/Help/prop_tgt/LINK_WHAT_YOU_USE.rst	900	%%DATADIR%%/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
Lines 904-915 share/aclocal/cmake.m4 Link Here
904	%%DATADIR%%/Help/prop_tgt/SOVERSION.rst	939	%%DATADIR%%/Help/prop_tgt/SOVERSION.rst
905	%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst	940	%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
906	%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst	941	%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
		942	%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
907	%%DATADIR%%/Help/prop_tgt/SUFFIX.rst	943	%%DATADIR%%/Help/prop_tgt/SUFFIX.rst
908	%%DATADIR%%/Help/prop_tgt/TYPE.rst	944	%%DATADIR%%/Help/prop_tgt/TYPE.rst
909	%%DATADIR%%/Help/prop_tgt/VERSION.rst	945	%%DATADIR%%/Help/prop_tgt/VERSION.rst
910	%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst	946	%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
911	%%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst	947	%%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
912	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst	948	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst
		949	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst
		950	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst
913	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst	951	%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst
914	%%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst	952	%%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
915	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst	953	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
Lines 940-945 share/aclocal/cmake.m4 Link Here
940	%%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst	978	%%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
941	%%DATADIR%%/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst	979	%%DATADIR%%/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
942	%%DATADIR%%/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst	980	%%DATADIR%%/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
		981	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER.rst
		982	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
		983	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ARGUMENTS.rst
		984	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
		985	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
		986	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
		987	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst
		988	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_EXECUTABLE.rst
		989	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_GUARD_MALLOC.rst
		990	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
		991	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
		992	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_SCRIBBLE.rst
		993	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_STACK.rst
		994	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER.rst
		995	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
		996	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
		997	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
		998	%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.rst
943	%%DATADIR%%/Help/prop_tgt/XCTEST.rst	999	%%DATADIR%%/Help/prop_tgt/XCTEST.rst
944	%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt	1000	%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
945	%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt	1001	%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
Lines 948-953 share/aclocal/cmake.m4 Link Here
948	%%DATADIR%%/Help/release/3.10.rst	1004	%%DATADIR%%/Help/release/3.10.rst
949	%%DATADIR%%/Help/release/3.11.rst	1005	%%DATADIR%%/Help/release/3.11.rst
950	%%DATADIR%%/Help/release/3.12.rst	1006	%%DATADIR%%/Help/release/3.12.rst
		1007	%%DATADIR%%/Help/release/3.13.rst
951	%%DATADIR%%/Help/release/3.2.rst	1008	%%DATADIR%%/Help/release/3.2.rst
952	%%DATADIR%%/Help/release/3.3.rst	1009	%%DATADIR%%/Help/release/3.3.rst
953	%%DATADIR%%/Help/release/3.4.rst	1010	%%DATADIR%%/Help/release/3.4.rst
Lines 962-967 share/aclocal/cmake.m4 Link Here
962	%%DATADIR%%/Help/variable/APPLE.rst	1019	%%DATADIR%%/Help/variable/APPLE.rst
963	%%DATADIR%%/Help/variable/BORLAND.rst	1020	%%DATADIR%%/Help/variable/BORLAND.rst
964	%%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst	1021	%%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
		1022	%%DATADIR%%/Help/variable/CACHE.rst
965	%%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst	1023	%%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
966	%%DATADIR%%/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst	1024	%%DATADIR%%/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
967	%%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst	1025	%%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
Lines 995-1000 share/aclocal/cmake.m4 Link Here
995	%%DATADIR%%/Help/variable/CMAKE_ARGC.rst	1053	%%DATADIR%%/Help/variable/CMAKE_ARGC.rst
996	%%DATADIR%%/Help/variable/CMAKE_ARGV0.rst	1054	%%DATADIR%%/Help/variable/CMAKE_ARGV0.rst
997	%%DATADIR%%/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst	1055	%%DATADIR%%/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst
		1056	%%DATADIR%%/Help/variable/CMAKE_AUTOGEN_VERBOSE.rst
998	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst	1057	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
999	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst	1058	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
1000	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst	1059	%%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
Lines 1032-1037 share/aclocal/cmake.m4 Link Here
1032	%%DATADIR%%/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst	1091	%%DATADIR%%/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
1033	%%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst	1092	%%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
1034	%%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst	1093	%%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst
		1094	%%DATADIR%%/Help/variable/CMAKE_CPACK_COMMAND.rst
1035	%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst	1095	%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst
1036	%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst	1096	%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
1037	%%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst	1097	%%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst
Lines 1192-1197 share/aclocal/cmake.m4 Link Here
1192	%%DATADIR%%/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst	1252	%%DATADIR%%/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst
1193	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst	1253	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst
1194	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst	1254	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst
		1255	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG.rst
		1256	%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP.rst
1195	%%DATADIR%%/Help/variable/CMAKE_LANG_LINK_EXECUTABLE.rst	1257	%%DATADIR%%/Help/variable/CMAKE_LANG_LINK_EXECUTABLE.rst
1196	%%DATADIR%%/Help/variable/CMAKE_LANG_OUTPUT_EXTENSION.rst	1258	%%DATADIR%%/Help/variable/CMAKE_LANG_OUTPUT_EXTENSION.rst
1197	%%DATADIR%%/Help/variable/CMAKE_LANG_PLATFORM_ID.rst	1259	%%DATADIR%%/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
Lines 1210-1215 share/aclocal/cmake.m4 Link Here
1210	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst	1272	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst
1211	%%DATADIR%%/Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst	1273	%%DATADIR%%/Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst
1212	%%DATADIR%%/Help/variable/CMAKE_LINK_DEPENDS_NO_SHARED.rst	1274	%%DATADIR%%/Help/variable/CMAKE_LINK_DEPENDS_NO_SHARED.rst
		1275	%%DATADIR%%/Help/variable/CMAKE_LINK_DIRECTORIES_BEFORE.rst
1213	%%DATADIR%%/Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst	1276	%%DATADIR%%/Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst
1214	%%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst	1277	%%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst
1215	%%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst	1278	%%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
Lines 1264-1269 share/aclocal/cmake.m4 Link Here
1264	%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_TWEAK.rst	1327	%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_TWEAK.rst
1265	%%DATADIR%%/Help/variable/CMAKE_RANLIB.rst	1328	%%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
1266	%%DATADIR%%/Help/variable/CMAKE_ROOT.rst	1329	%%DATADIR%%/Help/variable/CMAKE_ROOT.rst
		1330	%%DATADIR%%/Help/variable/CMAKE_RULE_MESSAGES.rst
1267	%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst	1331	%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
1268	%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst	1332	%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
1269	%%DATADIR%%/Help/variable/CMAKE_SCRIPT_MODE_FILE.rst	1333	%%DATADIR%%/Help/variable/CMAKE_SCRIPT_MODE_FILE.rst
Lines 1319-1324 share/aclocal/cmake.m4 Link Here
1319	%%DATADIR%%/Help/variable/CMAKE_VERSION.rst	1383	%%DATADIR%%/Help/variable/CMAKE_VERSION.rst
1320	%%DATADIR%%/Help/variable/CMAKE_VISIBILITY_INLINES_HIDDEN.rst	1384	%%DATADIR%%/Help/variable/CMAKE_VISIBILITY_INLINES_HIDDEN.rst
1321	%%DATADIR%%/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst	1385	%%DATADIR%%/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
		1386	%%DATADIR%%/Help/variable/CMAKE_VS_GLOBALS.rst
1322	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst	1387	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
1323	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD.rst	1388	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD.rst
1324	%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst	1389	%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
Lines 1337-1342 share/aclocal/cmake.m4 Link Here
1337	%%DATADIR%%/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst	1402	%%DATADIR%%/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst
1338	%%DATADIR%%/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst	1403	%%DATADIR%%/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst
1339	%%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst	1404	%%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
		1405	%%DATADIR%%/Help/variable/CMAKE_VS_WINRT_BY_DEFAULT.rst
1340	%%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst	1406	%%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst
1341	%%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst	1407	%%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
1342	%%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst	1408	%%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
Lines 1345-1350 share/aclocal/cmake.m4 Link Here
1345	%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst	1411	%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
1346	%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst	1412	%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
1347	%%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst	1413	%%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
		1414	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER.rst
		1415	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
		1416	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
		1417	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
		1418	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
		1419	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
		1420	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
		1421	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
		1422	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE.rst
		1423	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_STACK.rst
		1424	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER.rst
		1425	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
		1426	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
		1427	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
		1428	%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.rst
1348	%%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst	1429	%%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
1349	%%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst	1430	%%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
1350	%%DATADIR%%/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst	1431	%%DATADIR%%/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
Lines 1444-1450 share/aclocal/cmake.m4 Link Here
1444	%%DATADIR%%/Help/variable/MSVC_IDE.rst	1525	%%DATADIR%%/Help/variable/MSVC_IDE.rst
1445	%%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst	1526	%%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst
1446	%%DATADIR%%/Help/variable/MSVC_VERSION.rst	1527	%%DATADIR%%/Help/variable/MSVC_VERSION.rst
1447	%%DATADIR%%/Help/variable/PackageName_ROOT.rst
1448	%%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst	1528	%%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst
1449	%%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst	1529	%%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst
1450	%%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst	1530	%%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst
Lines 1464-1469 share/aclocal/cmake.m4 Link Here
1464	%%DATADIR%%/Help/variable/PROJECT_VERSION_MINOR.rst	1544	%%DATADIR%%/Help/variable/PROJECT_VERSION_MINOR.rst
1465	%%DATADIR%%/Help/variable/PROJECT_VERSION_PATCH.rst	1545	%%DATADIR%%/Help/variable/PROJECT_VERSION_PATCH.rst
1466	%%DATADIR%%/Help/variable/PROJECT_VERSION_TWEAK.rst	1546	%%DATADIR%%/Help/variable/PROJECT_VERSION_TWEAK.rst
		1547	%%DATADIR%%/Help/variable/PackageName_ROOT.rst
1467	%%DATADIR%%/Help/variable/UNIX.rst	1548	%%DATADIR%%/Help/variable/UNIX.rst
1468	%%DATADIR%%/Help/variable/WIN32.rst	1549	%%DATADIR%%/Help/variable/WIN32.rst
1469	%%DATADIR%%/Help/variable/WINCE.rst	1550	%%DATADIR%%/Help/variable/WINCE.rst
Lines 1608-1629 share/aclocal/cmake.m4 Link Here
1608	%%DATADIR%%/Modules/CPack.background.png.in	1689	%%DATADIR%%/Modules/CPack.background.png.in
1609	%%DATADIR%%/Modules/CPack.cmake	1690	%%DATADIR%%/Modules/CPack.cmake
1610	%%DATADIR%%/Modules/CPack.distribution.dist.in	1691	%%DATADIR%%/Modules/CPack.distribution.dist.in
1611	%%DATADIR%%/Modules/CPackArchive.cmake
1612	%%DATADIR%%/Modules/CPackBundle.cmake
1613	%%DATADIR%%/Modules/CPackComponent.cmake	1692	%%DATADIR%%/Modules/CPackComponent.cmake
1614	%%DATADIR%%/Modules/CPackCygwin.cmake
1615	%%DATADIR%%/Modules/CPackDMG.cmake
1616	%%DATADIR%%/Modules/CPackDeb.cmake
1617	%%DATADIR%%/Modules/CPackFreeBSD.cmake
1618	%%DATADIR%%/Modules/CPackIFW.cmake	1693	%%DATADIR%%/Modules/CPackIFW.cmake
1619	%%DATADIR%%/Modules/CPackIFWConfigureFile.cmake	1694	%%DATADIR%%/Modules/CPackIFWConfigureFile.cmake
1620	%%DATADIR%%/Modules/CPackNSIS.cmake
1621	%%DATADIR%%/Modules/CPackNuGet.cmake
1622	%%DATADIR%%/Modules/CPackPackageMaker.cmake
1623	%%DATADIR%%/Modules/CPackProductBuild.cmake
1624	%%DATADIR%%/Modules/CPackRPM.cmake
1625	%%DATADIR%%/Modules/CPackWIX.cmake
1626	%%DATADIR%%/Modules/CPackZIP.cmake
1627	%%DATADIR%%/Modules/CSharpUtilities.cmake	1695	%%DATADIR%%/Modules/CSharpUtilities.cmake
1628	%%DATADIR%%/Modules/CTest.cmake	1696	%%DATADIR%%/Modules/CTest.cmake
1629	%%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake	1697	%%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake
Lines 2045-2050 share/aclocal/cmake.m4 Link Here
2045	%%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt	2113	%%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt
2046	%%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake	2114	%%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake
2047	%%DATADIR%%/Modules/IntelVSImplicitPath/hello.f	2115	%%DATADIR%%/Modules/IntelVSImplicitPath/hello.f
		2116	%%DATADIR%%/Modules/Internal/CPack/CPackDeb.cmake
		2117	%%DATADIR%%/Modules/Internal/CPack/CPackExternal.cmake
		2118	%%DATADIR%%/Modules/Internal/CPack/CPackFreeBSD.cmake
		2119	%%DATADIR%%/Modules/Internal/CPack/CPackNuGet.cmake
		2120	%%DATADIR%%/Modules/Internal/CPack/CPackRPM.cmake
		2121	%%DATADIR%%/Modules/Internal/CPack/CPackWIX.cmake
		2122	%%DATADIR%%/Modules/Internal/CPack/CPackZIP.cmake
2048	%%DATADIR%%/Modules/Internal/FeatureTesting.cmake	2123	%%DATADIR%%/Modules/Internal/FeatureTesting.cmake
2049	%%DATADIR%%/Modules/KDE3Macros.cmake	2124	%%DATADIR%%/Modules/KDE3Macros.cmake
2050	%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in	2125	%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
Lines 2321-2329 share/aclocal/cmake.m4 Link Here
2321	%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake	2396	%%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
2322	%%DATADIR%%/Modules/Platform/WindowsCE.cmake	2397	%%DATADIR%%/Modules/Platform/WindowsCE.cmake
2323	%%DATADIR%%/Modules/Platform/WindowsPaths.cmake	2398	%%DATADIR%%/Modules/Platform/WindowsPaths.cmake
		2399	%%DATADIR%%/Modules/Platform/WindowsPhone-Clang-C.cmake
		2400	%%DATADIR%%/Modules/Platform/WindowsPhone-Clang-CXX.cmake
		2401	%%DATADIR%%/Modules/Platform/WindowsPhone-GNU-C.cmake
		2402	%%DATADIR%%/Modules/Platform/WindowsPhone-GNU-CXX.cmake
2324	%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake	2403	%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake
2325	%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake	2404	%%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
2326	%%DATADIR%%/Modules/Platform/WindowsPhone.cmake	2405	%%DATADIR%%/Modules/Platform/WindowsPhone.cmake
		2406	%%DATADIR%%/Modules/Platform/WindowsStore-Clang-C.cmake
		2407	%%DATADIR%%/Modules/Platform/WindowsStore-Clang-CXX.cmake
		2408	%%DATADIR%%/Modules/Platform/WindowsStore-GNU-C.cmake
		2409	%%DATADIR%%/Modules/Platform/WindowsStore-GNU-CXX.cmake
2327	%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake	2410	%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake
2328	%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake	2411	%%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake
2329	%%DATADIR%%/Modules/Platform/WindowsStore.cmake	2412	%%DATADIR%%/Modules/Platform/WindowsStore.cmake
Lines 2362-2367 share/aclocal/cmake.m4 Link Here
2362	%%DATADIR%%/Modules/UsePkgConfig.cmake	2445	%%DATADIR%%/Modules/UsePkgConfig.cmake
2363	%%DATADIR%%/Modules/UseQt4.cmake	2446	%%DATADIR%%/Modules/UseQt4.cmake
2364	%%DATADIR%%/Modules/UseSWIG.cmake	2447	%%DATADIR%%/Modules/UseSWIG.cmake
		2448	%%DATADIR%%/Modules/UseSWIG/ManageSupportFiles.cmake
2365	%%DATADIR%%/Modules/Use_wxWindows.cmake	2449	%%DATADIR%%/Modules/Use_wxWindows.cmake
2366	%%DATADIR%%/Modules/UsewxWidgets.cmake	2450	%%DATADIR%%/Modules/UsewxWidgets.cmake
2367	%%DATADIR%%/Modules/VTKCompatibility.cmake	2451	%%DATADIR%%/Modules/VTKCompatibility.cmake

Return to bug 233411

Removed Link Here

(-)a/devel/cmake/files/patch-Modules_FindBLAS.cmake (-34 lines)
1	When finding BLAS, we may need to explicitly add gcc_s from the correct
2	gcc directory to the libraries linked in while testing for BLAS functions.
3	Check for the necessity via some ldd trickery. PR 226959.
4
5	--- Modules/FindBLAS.cmake.orig 2018-04-06 14:25:24.441628000 +0200
6	+++ Modules/FindBLAS.cmake 2018-04-06 15:24:27.515872000 +0200
7	@@ -162,6 +162,27 @@
8	else()
9	check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
10	endif()
11	+ if (NOT ${_prefix}${_combined_name}_WORKS)
12	+ # On FreeBSD, we may need to link to gcc_s in a special way
13	+ execute_process(
14	+ COMMAND /usr/bin/ldd ${${LIBRARIES}}
15	+ COMMAND /usr/bin/grep gcc_s
16	+ COMMAND /usr/bin/cut -w -f 4
17	+ RESULT_VARIABLE _found_needed
18	+ OUTPUT_VARIABLE _output_needed
19	+ )
20	+# message("DEBUG: found=${_found_needed} output=${_output_needed}")
21	+ if (_found_needed EQUAL "0" AND _output_needed MATCHES "libgcc_s")
22	+ set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_output_needed} ${_thread})
23	+ message(STATUS "Re-trying ${LIBRARIES} search with gcc_s")
24	+ if (CMAKE_Fortran_COMPILER_LOADED)
25	+ check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS2)
26	+ else()
27	+ check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS2)
28	+ endif()
29	+ set(${_prefix}${_combined_name}_WORKS ${${_prefix}${_combined_name}_WORKS2})
30	+ endif()
31	+ endif()
32	set(CMAKE_REQUIRED_LIBRARIES)
33	mark_as_advanced(${_prefix}${_combined_name}_WORKS)
34	set(_libraries_work ${${_prefix}${_combined_name}_WORKS})

Removed Link Here

(-)a/devel/cmake/files/patch-Modules_GNUInstallDirs.cmake (-19 lines)
1	--- Modules/GNUInstallDirs.cmake.orig 2018-11-06 09:52:09 UTC
2	+++ Modules/GNUInstallDirs.cmake
3	@@ -276,14 +276,12 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "
4	_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
5	"Read-only architecture-independent data (DATAROOTDIR)")
6
7	+_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
8	+ "Info documentation (DATAROOTDIR/info)")
9	if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD\|DragonFly)$")
10	- _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
11	- "Info documentation (info)")
12	_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
13	"Man documentation (man)")
14	else()
15	- _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
16	- "Info documentation (DATAROOTDIR/info)")
17	_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man"
18	"Man documentation (DATAROOTDIR/man)")
19	endif()

Added Link Here

(-)b/devel/cmake/files/patch-git_ff06b35 (+35 lines)
1	From bde3c3043ae2b48f7d62affaf25a4387dea1a22a Mon Sep 17 00:00:00 2001
2	From: "Tobias C. Berner" <tcberner@FreeBSD.org>
3	Date: Sun, 11 Nov 2018 19:09:57 +0100
4	Subject: [PATCH] FreeBSD switch the installation location of info files to
5	share/info.
6
7	---
8	Modules/GNUInstallDirs.cmake \| 11 ++++++++---
9	1 file changed, 8 insertions(+), 3 deletions(-)
10
11	diff --git Modules/GNUInstallDirs.cmake Modules/GNUInstallDirs.cmake
12	index 48d830ff5..c25363287 100644
13	--- Modules/GNUInstallDirs.cmake
14	+++ Modules/GNUInstallDirs.cmake
15	@@ -277,9 +277,14 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
16	_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
17	"Read-only architecture-independent data (DATAROOTDIR)")
18
19	-if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD\|DragonFly)$")
20	- _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
21	- "Info documentation (info)")
22	+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD\|DragonFly)$")
23	+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
24	+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
25	+ "Info documentation (DATAROOTDIR/info)")
26	+ else()
27	+ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
28	+ "Info documentation (info)")
29	+ endif()
30	_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
31	"Man documentation (man)")
32	else()
33	--
34	2.19.1
35