Attachment 163248 Details for Bug 204629 – Patch v1

[patch] Patch v1

cmake-3.4.0-v1.patch (text/plain), 24.82 KB, created by Raphael Kubo da Costa on 2015-11-17 14:15:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2015-11-17 14:15:44 UTC

Size: 24.82 KB

patch

obsolete

>Index: devel/cmake/files/patch-git_ffa6f057
>===================================================================
>--- devel/cmake/files/patch-git_ffa6f057	(revision 11526)
>+++ devel/cmake/files/patch-git_ffa6f057	(nonexistent)
>@@ -1,82 +0,0 @@
>-commit ffa6f057b4ae07c9dc7b9e1d12ecc0a2e19333a1
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Tue Sep 15 16:31:12 2015 +0200
>-
>-    Avoid using C11 to build CMake if _Thread_local support is broken
>-    
>-    Support for C11's _Thread_local was introduced in GCC in the 4.9 series,
>-    even though we make the C11 compiler flags available in CMake with GCC
>-    >= 4.6.
>-    
>-    FreeBSD's runetype.h uses _Thread_local, which causes CMake's own build
>-    to fail when using GCC < 4.9 and -std=gnu11:
>-    
>-      /usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const'
>-       extern _Thread_local const _RuneLocale *_ThreadRuneLocale;
>-    
>-    Add a test for _Thread_local support and only build CMake itself with
>-    C11 support if it works.
>-    
>-    Bug: http://www.cmake.org/Bug/view.php?id=15741
>-
>---- CMakeLists.txt
>-+++ CMakeLists.txt
>-@@ -38,7 +38,12 @@ endif()
>- 
>- # Use most-recent available language dialects with GNU and Clang
>- if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
>--  set(CMAKE_C_STANDARD 11)
>-+  include(${CMake_SOURCE_DIR}/Source/Checks/cm_c11_thread_local.cmake)
>-+  if(NOT CMake_C11_THREAD_LOCAL_BROKEN)
>-+    set(CMAKE_C_STANDARD 11)
>-+  else()
>-+    set(CMAKE_C_STANDARD 99)
>-+  endif()
>- endif()
>- if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
>-   include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
>-new file mode 100644
>-index 0000000..ab780f2
>---- /dev/null
>-+++ Source/Checks/cm_c11_thread_local.c
>-@@ -0,0 +1,2 @@
>-+_Thread_local int i = 42;
>-+int main(void) { return 0; }
>-new file mode 100644
>-index 0000000..6b8d10b
>---- /dev/null
>-+++ Source/Checks/cm_c11_thread_local.cmake
>-@@ -0,0 +1,33 @@
>-+set(CMake_C11_THREAD_LOCAL_BROKEN 0)
>-+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_C11_STANDARD_COMPILE_OPTION)
>-+  if(NOT DEFINED CMake_C11_THREAD_LOCAL_WORKS)
>-+    message(STATUS "Checking if compiler supports C11 _Thread_local")
>-+    try_compile(CMake_C11_THREAD_LOCAL_WORKS
>-+      ${CMAKE_CURRENT_BINARY_DIR}
>-+      ${CMAKE_CURRENT_LIST_DIR}/cm_c11_thread_local.c
>-+      CMAKE_FLAGS -DCMAKE_C_STANDARD=11
>-+      OUTPUT_VARIABLE OUTPUT
>-+      )
>-+    if(CMake_C11_THREAD_LOCAL_WORKS AND "${OUTPUT}" MATCHES "error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'")
>-+      set_property(CACHE CMake_C11_THREAD_LOCAL_WORKS PROPERTY VALUE 0)
>-+    endif()
>-+    if(CMake_C11_THREAD_LOCAL_WORKS)
>-+      message(STATUS "Checking if compiler supports C11 _Thread_local - yes")
>-+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
>-+        "Determining if compiler supports C11 _Thread_local passed with the following output:\n"
>-+        "${OUTPUT}\n"
>-+        "\n"
>-+        )
>-+    else()
>-+      message(STATUS "Checking if compiler supports C11 _Thread_local - no")
>-+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
>-+        "Determining if compiler supports C11 _Thread_local failed with the following output:\n"
>-+        "${OUTPUT}\n"
>-+        "\n"
>-+        )
>-+    endif()
>-+  endif()
>-+  if(NOT CMake_C11_THREAD_LOCAL_WORKS)
>-+    set(CMake_C11_THREAD_LOCAL_BROKEN 1)
>-+  endif()
>-+endif()
>
>Property changes on: devel/cmake/files/patch-git_ffa6f057
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/cmake/files/patch-Modules_FindwxWidgets.cmake
>===================================================================
>--- devel/cmake/files/patch-Modules_FindwxWidgets.cmake	(revision 11526)
>+++ devel/cmake/files/patch-Modules_FindwxWidgets.cmake	(revision 11527)
>@@ -4,8 +4,8 @@
>      #-----------------------------------------------------------------
>      # Support cross-compiling, only search in the target platform.
>      find_program(wxWidgets_CONFIG_EXECUTABLE
>--      NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
>-+      NAMES $ENV{WX_CONFIG} wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
>+-      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
>        )
>Index: devel/cmake/pkg-plist
>===================================================================
>--- devel/cmake/pkg-plist	(revision 11526)
>+++ devel/cmake/pkg-plist	(revision 11527)
>@@ -22,7 +22,6 @@
> %%MANPAGES%%man/man7/cmake-variables.7.gz
> share/aclocal/cmake.m4
> %%DATADIR%%/Help/command/FIND_XXX.txt
>-%%DATADIR%%/Help/command/FIND_XXX_MAC.txt
> %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
> %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
> %%DATADIR%%/Help/command/add_compile_options.rst
>@@ -484,6 +483,8 @@
> %%DATADIR%%/Help/policy/CMP0061.rst
> %%DATADIR%%/Help/policy/CMP0062.rst
> %%DATADIR%%/Help/policy/CMP0063.rst
>+%%DATADIR%%/Help/policy/CMP0064.rst
>+%%DATADIR%%/Help/policy/CMP0065.rst
> %%DATADIR%%/Help/policy/DEPRECATED.txt
> %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
> %%DATADIR%%/Help/prop_cache/ADVANCED.rst
>@@ -542,6 +543,7 @@
> %%DATADIR%%/Help/prop_gbl/RULE_LAUNCH_LINK.rst
> %%DATADIR%%/Help/prop_gbl/RULE_MESSAGES.rst
> %%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
>+%%DATADIR%%/Help/prop_gbl/TARGET_MESSAGES.rst
> %%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
> %%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst
> %%DATADIR%%/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
>@@ -596,8 +598,23 @@
> %%DATADIR%%/Help/prop_test/WILL_FAIL.rst
> %%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst
> %%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/ANDROID_API.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_API_MIN.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_ARCH.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst
> %%DATADIR%%/Help/prop_tgt/ANDROID_GUI.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_PROCESS_MAX.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_PROGUARD.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst
>+%%DATADIR%%/Help/prop_tgt/ANDROID_STL_TYPE.rst
> %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
> %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
>@@ -609,6 +626,7 @@
> %%DATADIR%%/Help/prop_tgt/AUTORCC_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/AUTOUIC.rst
> %%DATADIR%%/Help/prop_tgt/AUTOUIC_OPTIONS.rst
>+%%DATADIR%%/Help/prop_tgt/BINARY_DIR.rst
> %%DATADIR%%/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
> %%DATADIR%%/Help/prop_tgt/BUNDLE.rst
> %%DATADIR%%/Help/prop_tgt/BUNDLE_EXTENSION.rst
>@@ -645,6 +663,7 @@
> %%DATADIR%%/Help/prop_tgt/EchoString.rst
> %%DATADIR%%/Help/prop_tgt/FOLDER.rst
> %%DATADIR%%/Help/prop_tgt/FRAMEWORK.rst
>+%%DATADIR%%/Help/prop_tgt/FRAMEWORK_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/Fortran_FORMAT.rst
> %%DATADIR%%/Help/prop_tgt/Fortran_MODULE_DIRECTORY.rst
> %%DATADIR%%/Help/prop_tgt/GENERATOR_FILE_NAME.rst
>@@ -675,7 +694,6 @@
> %%DATADIR%%/Help/prop_tgt/INSTALL_NAME_DIR.rst
> %%DATADIR%%/Help/prop_tgt/INSTALL_RPATH.rst
> %%DATADIR%%/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
>-%%DATADIR%%/Help/prop_tgt/ANDROID_API_MIN.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
>@@ -691,6 +709,7 @@
> %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
> %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
> %%DATADIR%%/Help/prop_tgt/LABELS.rst
>+%%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
> %%DATADIR%%/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
> %%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
> %%DATADIR%%/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
>@@ -745,6 +764,7 @@
> %%DATADIR%%/Help/prop_tgt/RUNTIME_OUTPUT_NAME_CONFIG.rst
> %%DATADIR%%/Help/prop_tgt/SKIP_BUILD_RPATH.rst
> %%DATADIR%%/Help/prop_tgt/SOURCES.rst
>+%%DATADIR%%/Help/prop_tgt/SOURCE_DIR.rst
> %%DATADIR%%/Help/prop_tgt/SOVERSION.rst
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
> %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
>@@ -752,6 +772,7 @@
> %%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_DESKTOP_EXTENSIONS_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
> %%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
>@@ -758,15 +779,20 @@
> %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_PROJECT_TYPES.rst
> %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_ROOTNAMESPACE.rst
> %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_variable.rst
>+%%DATADIR%%/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
>+%%DATADIR%%/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
> %%DATADIR%%/Help/prop_tgt/VS_KEYWORD.rst
>+%%DATADIR%%/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VS_SCC_AUXPATH.rst
> %%DATADIR%%/Help/prop_tgt/VS_SCC_LOCALPATH.rst
> %%DATADIR%%/Help/prop_tgt/VS_SCC_PROJECTNAME.rst
> %%DATADIR%%/Help/prop_tgt/VS_SCC_PROVIDER.rst
>+%%DATADIR%%/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
> %%DATADIR%%/Help/prop_tgt/VS_WINRT_COMPONENT.rst
> %%DATADIR%%/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
> %%DATADIR%%/Help/prop_tgt/VS_WINRT_REFERENCES.rst
> %%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst
>+%%DATADIR%%/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
> %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
> %%DATADIR%%/Help/prop_tgt/XCTEST.rst
> %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
>@@ -775,6 +801,7 @@
> %%DATADIR%%/Help/release/3.1.rst
> %%DATADIR%%/Help/release/3.2.rst
> %%DATADIR%%/Help/release/3.3.rst
>+%%DATADIR%%/Help/release/3.4.rst
> %%DATADIR%%/Help/release/dev.txt
> %%DATADIR%%/Help/release/index.rst
> %%DATADIR%%/Help/variable/APPLE.rst
>@@ -781,9 +808,23 @@
> %%DATADIR%%/Help/variable/BORLAND.rst
> %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.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
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_ARCH.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_STL_TYPE.rst
> %%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_AR.rst
> %%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
>@@ -837,6 +878,7 @@
> %%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
> %%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst
> %%DATADIR%%/Help/variable/CMAKE_EDIT_COMMAND.rst
>+%%DATADIR%%/Help/variable/CMAKE_ENABLE_EXPORTS.rst
> %%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst
> %%DATADIR%%/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
> %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
>@@ -845,6 +887,8 @@
> %%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
> %%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
> %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
>+%%DATADIR%%/Help/variable/CMAKE_FIND_APPBUNDLE.rst
>+%%DATADIR%%/Help/variable/CMAKE_FIND_FRAMEWORK.rst
> %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
> %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
> %%DATADIR%%/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
>@@ -900,6 +944,7 @@
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ID.rst
>+%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LOADED.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst
>@@ -945,6 +990,8 @@
> %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst
>+%%DATADIR%%/Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst
>+%%DATADIR%%/Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst
> %%DATADIR%%/Help/variable/CMAKE_MACOSX_BUNDLE.rst
> %%DATADIR%%/Help/variable/CMAKE_MACOSX_RPATH.rst
> %%DATADIR%%/Help/variable/CMAKE_MAJOR_VERSION.rst
>@@ -1002,6 +1049,8 @@
> %%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst
> %%DATADIR%%/Help/variable/CMAKE_SYSROOT.rst
> %%DATADIR%%/Help/variable/CMAKE_SYSTEM.rst
>+%%DATADIR%%/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
>+%%DATADIR%%/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_SYSTEM_IGNORE_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_SYSTEM_INCLUDE_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_SYSTEM_LIBRARY_PATH.rst
>@@ -1027,9 +1076,11 @@
> %%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
>+%%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.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
>+%%DATADIR%%/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
> %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
> %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
>@@ -1045,6 +1096,7 @@
> %%DATADIR%%/Help/variable/CTEST_BUILD_NAME.rst
> %%DATADIR%%/Help/variable/CTEST_BZR_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_BZR_UPDATE_OPTIONS.rst
>+%%DATADIR%%/Help/variable/CTEST_CHANGE_ID.rst
> %%DATADIR%%/Help/variable/CTEST_CHECKOUT_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_CONFIGURATION_TYPE.rst
> %%DATADIR%%/Help/variable/CTEST_CONFIGURE_COMMAND.rst
>@@ -1051,6 +1103,24 @@
> %%DATADIR%%/Help/variable/CTEST_COVERAGE_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_COVERAGE_EXTRA_FLAGS.rst
> %%DATADIR%%/Help/variable/CTEST_CURL_OPTIONS.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_POST_TEST.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_PRE_TEST.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
>+%%DATADIR%%/Help/variable/CTEST_CUSTOM_XXX.txt
> %%DATADIR%%/Help/variable/CTEST_CVS_CHECKOUT.rst
> %%DATADIR%%/Help/variable/CTEST_CVS_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst
>@@ -1060,6 +1130,7 @@
> %%DATADIR%%/Help/variable/CTEST_DROP_SITE_CDASH.rst
> %%DATADIR%%/Help/variable/CTEST_DROP_SITE_PASSWORD.rst
> %%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst
>+%%DATADIR%%/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
> %%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
> %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
>@@ -1081,6 +1152,7 @@
> %%DATADIR%%/Help/variable/CTEST_SVN_COMMAND.rst
> %%DATADIR%%/Help/variable/CTEST_SVN_OPTIONS.rst
> %%DATADIR%%/Help/variable/CTEST_SVN_UPDATE_OPTIONS.rst
>+%%DATADIR%%/Help/variable/CTEST_TEST_LOAD.rst
> %%DATADIR%%/Help/variable/CTEST_TEST_TIMEOUT.rst
> %%DATADIR%%/Help/variable/CTEST_TRIGGER_SITE.rst
> %%DATADIR%%/Help/variable/CTEST_UPDATE_COMMAND.rst
>Index: devel/cmake/Makefile
>===================================================================
>--- devel/cmake/Makefile	(revision 11526)
>+++ devel/cmake/Makefile	(revision 11527)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-PORTVERSION=	3.3.1
>+PORTVERSION=	3.4.0
> PORTREVISION?=	0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.cmake.org/files/v3.3/
>+MASTER_SITES=	http://www.cmake.org/files/v3.4/
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT?=	Cross-platform Makefile generator
>Index: devel/cmake/distinfo
>===================================================================
>--- devel/cmake/distinfo	(revision 11526)
>+++ devel/cmake/distinfo	(revision 11527)
>@@ -1,2 +1,2 @@
>-SHA256 (cmake-3.3.1.tar.gz) = cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6
>-SIZE (cmake-3.3.1.tar.gz) = 6577869
>+SHA256 (cmake-3.4.0.tar.gz) = a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
>+SIZE (cmake-3.4.0.tar.gz) = 6719859
>Index: devel/cmake-gui/Makefile
>===================================================================
>--- devel/cmake-gui/Makefile	(revision 11526)
>+++ devel/cmake-gui/Makefile	(revision 11527)
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-PORTVERSION=	3.3.1
>+PORTVERSION=	3.4.0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.cmake.org/files/v3.3/
>+MASTER_SITES=	http://www.cmake.org/files/v3.4/
> PKGNAMESUFFIX=	-gui
> 
> MAINTAINER=	kde@FreeBSD.org
>Index: devel/cmake-modules/pkg-plist
>===================================================================
>--- devel/cmake-modules/pkg-plist	(revision 11526)
>+++ devel/cmake-modules/pkg-plist	(revision 11527)
>@@ -26,7 +26,6 @@
> %%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
> %%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
> %%DATADIR%%/Modules/CMakeCXXInformation.cmake
>-%%DATADIR%%/Modules/CMakeClDeps.cmake
> %%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
> %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
> %%DATADIR%%/Modules/CMakeCompilerABI.h
>@@ -39,13 +38,14 @@
> %%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
>+%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
> %%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
>-%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
> %%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
> %%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
>+%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineSystem.cmake
> %%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake
> %%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake
>@@ -86,6 +86,8 @@
> %%DATADIR%%/Modules/CMakePushCheckState.cmake
> %%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
> %%DATADIR%%/Modules/CMakeRCInformation.cmake
>+%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in
>+%%DATADIR%%/Modules/CMakeSwiftInformation.cmake
> %%DATADIR%%/Modules/CMakeSystem.cmake.in
> %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
> %%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
>@@ -100,6 +102,7 @@
> %%DATADIR%%/Modules/CMakeTestGNU.c
> %%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
>+%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestWatcomVersion.c
> %%DATADIR%%/Modules/CMakeUnixFindMake.cmake
> %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
>@@ -168,12 +171,13 @@
> %%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
>+%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
>-%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
>+%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
>-%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
> %%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/Clang-C.cmake
>@@ -226,8 +230,8 @@
> %%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
> %%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
>-%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
>@@ -285,6 +289,7 @@
> %%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in
> %%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in
> %%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
>+%%DATADIR%%/Modules/CompilerId/main.swift.in
> %%DATADIR%%/Modules/Dart.cmake
> %%DATADIR%%/Modules/DartConfiguration.tcl.in
> %%DATADIR%%/Modules/DeployQt4.cmake
>@@ -492,6 +497,8 @@
> %%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
> %%DATADIR%%/Modules/Platform/AIX-XL.cmake
> %%DATADIR%%/Modules/Platform/AIX.cmake
>+%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
>+%%DATADIR%%/Modules/Platform/ARTOS.cmake
> %%DATADIR%%/Modules/Platform/Android.cmake
> %%DATADIR%%/Modules/Platform/BSDOS.cmake
> %%DATADIR%%/Modules/Platform/BeOS.cmake
>@@ -557,6 +564,7 @@
> %%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
> %%DATADIR%%/Modules/Platform/Darwin.cmake
> %%DATADIR%%/Modules/Platform/DragonFly.cmake
>+%%DATADIR%%/Modules/Platform/Euros.cmake
> %%DATADIR%%/Modules/Platform/FreeBSD.cmake
> %%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
> %%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
>@@ -569,6 +577,7 @@
> %%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
> %%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
> %%DATADIR%%/Modules/Platform/Generic.cmake
>+%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake
>@@ -577,7 +586,6 @@
> %%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
>-%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
> %%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
> %%DATADIR%%/Modules/Platform/HP-UX.cmake
> %%DATADIR%%/Modules/Platform/Haiku.cmake
>@@ -584,6 +592,7 @@
> %%DATADIR%%/Modules/Platform/IRIX.cmake
> %%DATADIR%%/Modules/Platform/IRIX64.cmake
> %%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
>+%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake
> %%DATADIR%%/Modules/Platform/Linux-CXX.cmake
> %%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
> %%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
>@@ -709,9 +718,6 @@
> %%DATADIR%%/Modules/UsePkgConfig.cmake
> %%DATADIR%%/Modules/UseQt4.cmake
> %%DATADIR%%/Modules/UseSWIG.cmake
>-%%DATADIR%%/Modules/UseVTK40.cmake
>-%%DATADIR%%/Modules/UseVTKBuildSettings40.cmake
>-%%DATADIR%%/Modules/UseVTKConfig40.cmake
> %%DATADIR%%/Modules/Use_wxWindows.cmake
> %%DATADIR%%/Modules/UsewxWidgets.cmake
> %%DATADIR%%/Modules/VTKCompatibility.cmake
>@@ -743,6 +749,7 @@
> %%DATADIR%%/Templates/Windows/ApplicationIcon.png
> %%DATADIR%%/Templates/Windows/Logo.png
> %%DATADIR%%/Templates/Windows/SmallLogo.png
>+%%DATADIR%%/Templates/Windows/SmallLogo44x44.png
> %%DATADIR%%/Templates/Windows/SplashScreen.png
> %%DATADIR%%/Templates/Windows/StoreLogo.png
> %%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx

Actions: View | Diff

Attachments on bug 204629: 163248 | 163577