Attachment 199618 Details for Bug 233411 – v3

[patch] v3

cmake-3.13.0.v3.patch (text/plain), 25.38 KB, created by Tobias C. Berner on 2018-11-27 22:08:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2018-11-27 22:08:36 UTC

Size: 25.38 KB

patch

obsolete

>diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
>index 7745aa76575d..d61f68e6a819 100644
>--- a/devel/cmake-doc/Makefile
>+++ b/devel/cmake-doc/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-DISTVERSION=	3.12.4
>+DISTVERSION=	3.13.0
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> PKGNAMESUFFIX=	-doc
>diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
>index 4f79116e7159..26e154789ec9 100644
>--- a/devel/cmake-gui/Makefile
>+++ b/devel/cmake-gui/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-DISTVERSION=	3.12.4
>+DISTVERSION=	3.13.0
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> PKGNAMESUFFIX=	-gui
>@@ -26,7 +26,7 @@ CMAKE_OFF=	BUILD_CursesDialog \
> 		CMake_SPHINX_DEPEND_ON_EXECUTABLES
> CMAKE_ON=	BUILD_QtDialog \
> 		CMAKE_USE_SYSTEM_LIBRARIES \
>-		SPHINX_MAN 
>+		SPHINX_MAN
> CMAKE_ARGS=	-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
> 		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
> 
>diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
>index de3792ff87cf..2beb545b5ff7 100644
>--- a/devel/cmake/Makefile
>+++ b/devel/cmake/Makefile
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	cmake
> # Remember to update devel/cmake-doc and devel/cmake-gui as well.
>-DISTVERSION=	3.12.4
>-PORTREVISION=	2
>+DISTVERSION=	3.13.0
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> 
>@@ -36,7 +35,7 @@ OPTIONS_DEFAULT=MANPAGES
> OPTIONS_SUB=	yes
> 
> MANPAGES_USES=		python:env
>-MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
>+MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
> MANPAGES_CONFIGURE_ON=	--sphinx-man
> 
> CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
>diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
>index 63e5011b4176..d30982165a13 100644
>--- a/devel/cmake/distinfo
>+++ b/devel/cmake/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1541182860
>-SHA256 (cmake-3.12.4.tar.gz) = 5255584bfd043eb717562cff8942d472f1c0e4679c4941d84baadaa9b28e3194
>-SIZE (cmake-3.12.4.tar.gz) = 8388984
>+TIMESTAMP = 1542863561
>+SHA256 (cmake-3.13.0.tar.gz) = 4058b2f1a53c026564e8936698d56c3b352d90df067b195cb749a97a3d273c90
>+SIZE (cmake-3.13.0.tar.gz) = 8614802
>diff --git a/devel/cmake/files/patch-Modules_FindBLAS.cmake b/devel/cmake/files/patch-Modules_FindBLAS.cmake
>deleted file mode 100644
>index 5869baf8bb54..000000000000
>--- a/devel/cmake/files/patch-Modules_FindBLAS.cmake
>+++ /dev/null
>@@ -1,34 +0,0 @@
>-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_GNUInstallDirs.cmake b/devel/cmake/files/patch-Modules_GNUInstallDirs.cmake
>deleted file mode 100644
>index e2f77905049f..000000000000
>--- a/devel/cmake/files/patch-Modules_GNUInstallDirs.cmake
>+++ /dev/null
>@@ -1,19 +0,0 @@
>---- 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()
>diff --git a/devel/cmake/files/patch-git_b1bf00 b/devel/cmake/files/patch-git_b1bf00
>new file mode 100644
>index 000000000000..a0901b9b9760
>--- /dev/null
>+++ b/devel/cmake/files/patch-git_b1bf00
>@@ -0,0 +1,32 @@
>+From b1b5004c1a00b123170724dd3a2d8c024f72684a Mon Sep 17 00:00:00 2001
>+From: Sebastian Holtermann <sebholt@xwmw.org>
>+Date: Tue, 27 Nov 2018 10:50:49 +0100
>+Subject: [PATCH] Autogen: Fix empty uic executable string
>+
>+In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't
>+link against Qt5Widgets, the uic executable string is empty and
>+an error string "The uic executable \"\" does not exist" is generated.
>+In CMake 3.12 ``AUTOUIC`` was silently disabled instead.
>+This patch fixes the regression and restores the behavior of CMake 3.12.
>+
>+Fixes: #18630
>+---
>+ Source/cmQtAutoGenInitializer.cxx | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
>+index 8a202a2f64..ba7a565cae 100644
>+--- Source/cmQtAutoGenInitializer.cxx
>++++ Source/cmQtAutoGenInitializer.cxx
>+@@ -1409,7 +1409,7 @@ bool cmQtAutoGenInitializer::GetUicExecutable()
>+   }
>+ 
>+   // Test uic command
>+-  if (err.empty()) {
>++  if (err.empty() && !this->Uic.Executable.empty()) {
>+     if (cmSystemTools::FileExists(this->Uic.Executable, true)) {
>+       std::vector<std::string> command;
>+       command.push_back(this->Uic.Executable);
>+-- 
>+2.18.1
>+
>diff --git a/devel/cmake/files/patch-git_ff06b35 b/devel/cmake/files/patch-git_ff06b35
>new file mode 100644
>index 000000000000..85b9a47e470e
>--- /dev/null
>+++ b/devel/cmake/files/patch-git_ff06b35
>@@ -0,0 +1,35 @@
>+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
>+
>diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
>index f84f78e7e292..59ae0bbb7f1e 100644
>--- a/devel/cmake/pkg-plist
>+++ b/devel/cmake/pkg-plist
>@@ -22,11 +22,13 @@ bin/ctest
> %%MANPAGES%%man/man7/cmake-server.7.gz
> %%MANPAGES%%man/man7/cmake-toolchains.7.gz
> %%MANPAGES%%man/man7/cmake-variables.7.gz
>+%%MANPAGES%%man/man7/cpack-generators.7.gz
> share/aclocal/cmake.m4
>-%%DATADIR%%/Help/command/COMPILE_OPTIONS_SHELL.txt
> %%DATADIR%%/Help/command/FIND_XXX.txt
> %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
> %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
>+%%DATADIR%%/Help/command/LINK_OPTIONS_LINKER.txt
>+%%DATADIR%%/Help/command/OPTIONS_SHELL.txt
> %%DATADIR%%/Help/command/add_compile_definitions.rst
> %%DATADIR%%/Help/command/add_compile_options.rst
> %%DATADIR%%/Help/command/add_custom_command.rst
>@@ -35,6 +37,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/command/add_dependencies.rst
> %%DATADIR%%/Help/command/add_executable.rst
> %%DATADIR%%/Help/command/add_library.rst
>+%%DATADIR%%/Help/command/add_link_options.rst
> %%DATADIR%%/Help/command/add_subdirectory.rst
> %%DATADIR%%/Help/command/add_test.rst
> %%DATADIR%%/Help/command/aux_source_directory.rst
>@@ -135,7 +138,9 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/command/target_compile_features.rst
> %%DATADIR%%/Help/command/target_compile_options.rst
> %%DATADIR%%/Help/command/target_include_directories.rst
>+%%DATADIR%%/Help/command/target_link_directories.rst
> %%DATADIR%%/Help/command/target_link_libraries.rst
>+%%DATADIR%%/Help/command/target_link_options.rst
> %%DATADIR%%/Help/command/target_sources.rst
> %%DATADIR%%/Help/command/try_compile.rst
> %%DATADIR%%/Help/command/try_run.rst
>@@ -146,6 +151,20 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/command/variable_watch.rst
> %%DATADIR%%/Help/command/while.rst
> %%DATADIR%%/Help/command/write_file.rst
>+%%DATADIR%%/Help/cpack_gen/archive.rst
>+%%DATADIR%%/Help/cpack_gen/bundle.rst
>+%%DATADIR%%/Help/cpack_gen/cygwin.rst
>+%%DATADIR%%/Help/cpack_gen/deb.rst
>+%%DATADIR%%/Help/cpack_gen/dmg.rst
>+%%DATADIR%%/Help/cpack_gen/external.rst
>+%%DATADIR%%/Help/cpack_gen/freebsd.rst
>+%%DATADIR%%/Help/cpack_gen/ifw.rst
>+%%DATADIR%%/Help/cpack_gen/nsis.rst
>+%%DATADIR%%/Help/cpack_gen/nuget.rst
>+%%DATADIR%%/Help/cpack_gen/packagemaker.rst
>+%%DATADIR%%/Help/cpack_gen/productbuild.rst
>+%%DATADIR%%/Help/cpack_gen/rpm.rst
>+%%DATADIR%%/Help/cpack_gen/wix.rst
> %%DATADIR%%/Help/envvar/ASM_DIALECT.rst
> %%DATADIR%%/Help/envvar/ASM_DIALECTFLAGS.rst
> %%DATADIR%%/Help/envvar/CC.rst
>@@ -158,6 +177,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst
> %%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst
> %%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst
>+%%DATADIR%%/Help/envvar/CTEST_PROGRESS_OUTPUT.rst
> %%DATADIR%%/Help/envvar/CTEST_USE_LAUNCHERS_DEFAULT.rst
> %%DATADIR%%/Help/envvar/CUDACXX.rst
> %%DATADIR%%/Help/envvar/CUDAFLAGS.rst
>@@ -224,6 +244,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/manual/cmake-toolchains.7.rst
> %%DATADIR%%/Help/manual/cmake-variables.7.rst
> %%DATADIR%%/Help/manual/cmake.1.rst
>+%%DATADIR%%/Help/manual/cpack-generators.7.rst
> %%DATADIR%%/Help/manual/cpack.1.rst
> %%DATADIR%%/Help/manual/ctest.1.rst
> %%DATADIR%%/Help/module/AddFileDependencies.rst
>@@ -552,6 +573,12 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/policy/CMP0073.rst
> %%DATADIR%%/Help/policy/CMP0074.rst
> %%DATADIR%%/Help/policy/CMP0075.rst
>+%%DATADIR%%/Help/policy/CMP0076.rst
>+%%DATADIR%%/Help/policy/CMP0077.rst
>+%%DATADIR%%/Help/policy/CMP0078.rst
>+%%DATADIR%%/Help/policy/CMP0079.rst
>+%%DATADIR%%/Help/policy/CMP0080.rst
>+%%DATADIR%%/Help/policy/CMP0081.rst
> %%DATADIR%%/Help/policy/DEPRECATED.txt
> %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
> %%DATADIR%%/Help/prop_cache/ADVANCED.rst
>@@ -578,6 +605,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
> %%DATADIR%%/Help/prop_dir/LABELS.rst
> %%DATADIR%%/Help/prop_dir/LINK_DIRECTORIES.rst
>+%%DATADIR%%/Help/prop_dir/LINK_OPTIONS.rst
> %%DATADIR%%/Help/prop_dir/LISTFILE_STACK.rst
> %%DATADIR%%/Help/prop_dir/MACROS.rst
> %%DATADIR%%/Help/prop_dir/PARENT_DIRECTORY.rst
>@@ -776,6 +804,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
> %%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
>+%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
> %%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
> %%DATADIR%%/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
>@@ -830,7 +859,10 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
>+%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_DEPENDS.rst
>+%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_DIRECTORIES.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
>+%%DATADIR%%/Help/prop_tgt/INTERFACE_LINK_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_SOURCES.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
>@@ -853,6 +885,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/LINKER_LANGUAGE.rst
> %%DATADIR%%/Help/prop_tgt/LINK_DEPENDS.rst
> %%DATADIR%%/Help/prop_tgt/LINK_DEPENDS_NO_SHARED.rst
>+%%DATADIR%%/Help/prop_tgt/LINK_DIRECTORIES.rst
> %%DATADIR%%/Help/prop_tgt/LINK_FLAGS.rst
> %%DATADIR%%/Help/prop_tgt/LINK_FLAGS_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst
>@@ -860,6 +893,8 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY.rst
> %%DATADIR%%/Help/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/LINK_LIBRARIES.rst
>+%%DATADIR%%/Help/prop_tgt/LINK_LIBRARIES_INDIRECTION.txt
>+%%DATADIR%%/Help/prop_tgt/LINK_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/LINK_SEARCH_END_STATIC.rst
> %%DATADIR%%/Help/prop_tgt/LINK_SEARCH_START_STATIC.rst
> %%DATADIR%%/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
>@@ -904,12 +939,15 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/SOVERSION.rst
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
>+%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/SUFFIX.rst
> %%DATADIR%%/Help/prop_tgt/TYPE.rst
> %%DATADIR%%/Help/prop_tgt/VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
> %%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
> %%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst
>+%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst
>+%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst
> %%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst
> %%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
>@@ -940,6 +978,24 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ARGUMENTS.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_EXECUTABLE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_GUARD_MALLOC.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_SCRIBBLE.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_MALLOC_STACK.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
>+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS.rst
> %%DATADIR%%/Help/prop_tgt/XCTEST.rst
> %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
> %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
>@@ -948,6 +1004,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/release/3.10.rst
> %%DATADIR%%/Help/release/3.11.rst
> %%DATADIR%%/Help/release/3.12.rst
>+%%DATADIR%%/Help/release/3.13.rst
> %%DATADIR%%/Help/release/3.2.rst
> %%DATADIR%%/Help/release/3.3.rst
> %%DATADIR%%/Help/release/3.4.rst
>@@ -962,6 +1019,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/APPLE.rst
> %%DATADIR%%/Help/variable/BORLAND.rst
> %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
>+%%DATADIR%%/Help/variable/CACHE.rst
> %%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
>@@ -995,6 +1053,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_ARGC.rst
> %%DATADIR%%/Help/variable/CMAKE_ARGV0.rst
> %%DATADIR%%/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst
>+%%DATADIR%%/Help/variable/CMAKE_AUTOGEN_VERBOSE.rst
> %%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
> %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
> %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
>@@ -1032,6 +1091,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
> %%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
> %%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst
>+%%DATADIR%%/Help/variable/CMAKE_CPACK_COMMAND.rst
> %%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst
> %%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
> %%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst
>@@ -1192,6 +1252,8 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst
>+%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG.rst
>+%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_LINK_EXECUTABLE.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_OUTPUT_EXTENSION.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
>@@ -1210,6 +1272,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_DEPENDS_NO_SHARED.rst
>+%%DATADIR%%/Help/variable/CMAKE_LINK_DIRECTORIES_BEFORE.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
>@@ -1264,6 +1327,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_TWEAK.rst
> %%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
> %%DATADIR%%/Help/variable/CMAKE_ROOT.rst
>+%%DATADIR%%/Help/variable/CMAKE_RULE_MESSAGES.rst
> %%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
> %%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
> %%DATADIR%%/Help/variable/CMAKE_SCRIPT_MODE_FILE.rst
>@@ -1319,6 +1383,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_VISIBILITY_INLINES_HIDDEN.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
>+%%DATADIR%%/Help/variable/CMAKE_VS_GLOBALS.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
>@@ -1337,6 +1402,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
>+%%DATADIR%%/Help/variable/CMAKE_VS_WINRT_BY_DEFAULT.rst
> %%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst
> %%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
> %%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
>@@ -1345,6 +1411,21 @@ share/aclocal/cmake.m4
> %%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/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_STACK.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP.rst
>+%%DATADIR%%/Help/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.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
>@@ -1444,7 +1525,6 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/MSVC_IDE.rst
> %%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst
> %%DATADIR%%/Help/variable/MSVC_VERSION.rst
>-%%DATADIR%%/Help/variable/PackageName_ROOT.rst
> %%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst
> %%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst
> %%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst
>@@ -1464,6 +1544,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/PROJECT_VERSION_MINOR.rst
> %%DATADIR%%/Help/variable/PROJECT_VERSION_PATCH.rst
> %%DATADIR%%/Help/variable/PROJECT_VERSION_TWEAK.rst
>+%%DATADIR%%/Help/variable/PackageName_ROOT.rst
> %%DATADIR%%/Help/variable/UNIX.rst
> %%DATADIR%%/Help/variable/WIN32.rst
> %%DATADIR%%/Help/variable/WINCE.rst
>@@ -1608,22 +1689,9 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Modules/CPack.background.png.in
> %%DATADIR%%/Modules/CPack.cmake
> %%DATADIR%%/Modules/CPack.distribution.dist.in
>-%%DATADIR%%/Modules/CPackArchive.cmake
>-%%DATADIR%%/Modules/CPackBundle.cmake
> %%DATADIR%%/Modules/CPackComponent.cmake
>-%%DATADIR%%/Modules/CPackCygwin.cmake
>-%%DATADIR%%/Modules/CPackDMG.cmake
>-%%DATADIR%%/Modules/CPackDeb.cmake
>-%%DATADIR%%/Modules/CPackFreeBSD.cmake
> %%DATADIR%%/Modules/CPackIFW.cmake
> %%DATADIR%%/Modules/CPackIFWConfigureFile.cmake
>-%%DATADIR%%/Modules/CPackNSIS.cmake
>-%%DATADIR%%/Modules/CPackNuGet.cmake
>-%%DATADIR%%/Modules/CPackPackageMaker.cmake
>-%%DATADIR%%/Modules/CPackProductBuild.cmake
>-%%DATADIR%%/Modules/CPackRPM.cmake
>-%%DATADIR%%/Modules/CPackWIX.cmake
>-%%DATADIR%%/Modules/CPackZIP.cmake
> %%DATADIR%%/Modules/CSharpUtilities.cmake
> %%DATADIR%%/Modules/CTest.cmake
> %%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake
>@@ -2045,6 +2113,13 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Modules/IntelVSImplicitPath/CMakeLists.txt
> %%DATADIR%%/Modules/IntelVSImplicitPath/detect.cmake
> %%DATADIR%%/Modules/IntelVSImplicitPath/hello.f
>+%%DATADIR%%/Modules/Internal/CPack/CPackDeb.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackExternal.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackFreeBSD.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackNuGet.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackRPM.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackWIX.cmake
>+%%DATADIR%%/Modules/Internal/CPack/CPackZIP.cmake
> %%DATADIR%%/Modules/Internal/FeatureTesting.cmake
> %%DATADIR%%/Modules/KDE3Macros.cmake
> %%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
>@@ -2321,9 +2396,17 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsCE.cmake
> %%DATADIR%%/Modules/Platform/WindowsPaths.cmake
>+%%DATADIR%%/Modules/Platform/WindowsPhone-Clang-C.cmake
>+%%DATADIR%%/Modules/Platform/WindowsPhone-Clang-CXX.cmake
>+%%DATADIR%%/Modules/Platform/WindowsPhone-GNU-C.cmake
>+%%DATADIR%%/Modules/Platform/WindowsPhone-GNU-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-C.cmake
> %%DATADIR%%/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsPhone.cmake
>+%%DATADIR%%/Modules/Platform/WindowsStore-Clang-C.cmake
>+%%DATADIR%%/Modules/Platform/WindowsStore-Clang-CXX.cmake
>+%%DATADIR%%/Modules/Platform/WindowsStore-GNU-C.cmake
>+%%DATADIR%%/Modules/Platform/WindowsStore-GNU-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsStore-MSVC-C.cmake
> %%DATADIR%%/Modules/Platform/WindowsStore-MSVC-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsStore.cmake
>@@ -2362,6 +2445,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Modules/UsePkgConfig.cmake
> %%DATADIR%%/Modules/UseQt4.cmake
> %%DATADIR%%/Modules/UseSWIG.cmake
>+%%DATADIR%%/Modules/UseSWIG/ManageSupportFiles.cmake
> %%DATADIR%%/Modules/Use_wxWindows.cmake
> %%DATADIR%%/Modules/UsewxWidgets.cmake
> %%DATADIR%%/Modules/VTKCompatibility.cmake

Actions: View | Diff

Attachments on bug 233411: 199457 | 199618 | 199698