Attachment #172577 for bug #210988

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	PORTVERSION= 3.5.2	4	PORTVERSION= 3.6.0
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-8 Link Here

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




Required by CMake 3.6.0 for ImageMagick and other programs to be found.

commit 54475018ae3ea04558b5372bc270e7c08af723f4
Author: Brad King <brad.king@kitware.com>
Date:   Mon Jul 11 10:21:38 2016 -0400

    Restore find_(library|file|path) search of PATH itself

    The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path)
    prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped
    search of the entries in PATH itself in addition to the prefixes derived
    from it.  This regresses find modules that (incorrectly) depended on the
    behavior, including some of our own modules such as FindImageMagick.

    Restore the search of entries in PATH itself.  If we want to drop it
    later we will need to do so with a policy.  Fixes #16192.

--- Source/cmFindBase.cxx
+++ Source/cmFindBase.cxx
@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
     paths.AddEnvPath(this->EnvironmentPath);
 #if defined(_WIN32) || defined(__CYGWIN__)
     paths.AddEnvPrefixPath("PATH", true);
-    paths.AddEnvPath("PATH");
 #endif
-  } else {
-    // Add PATH
-    paths.AddEnvPath("PATH");
   }
+  // Add PATH
+  paths.AddEnvPath("PATH");
   paths.AddSuffixes(this->SearchPathSuffixes);
 }
 




While not strictly necessary because of patch-git_86dd2427, this patch helps
CMake determine the maximum size of the command line and determine whether
ninja generator needs to use .rsp files.

commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Fri Jul 15 12:46:53 2016 +0200

    Ninja: Generalize check for sysconf(3) call

    Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
    of hard-coding an incomplete list of operating systems that implement
    it.  In particular, it is available on BSD platforms that were not
    previously listed.

--- Source/cmNinjaNormalTargetGenerator.cxx
+++ Source/cmNinjaNormalTargetGenerator.cxx
@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 #ifdef _WIN32
     8000,
 #endif
-#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
+#if defined(_SC_ARG_MAX)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
     ((int)sysconf(_SC_ARG_MAX)) - 1000,
 #endif




This patch allows the ninja generator to work without forcing the use of .rsp
files, which cause problems for ar(1) which does not recognize the @file
syntax.

commit 86dd2427bcb7cd1d912fc802f70b15556e776d62
Author: Brad King <brad.king@kitware.com>
Date:   Fri Jul 15 09:37:03 2016 -0400

    Ninja: Do not force response files when no sysconf(3) limit is used

    Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
    forcing use of response files, 2016-04-06) started using negative
    command line length values to represent forced use of response files but
    forgot to update `calculateCommandLineLengthLimit()` accordingly.  Teach
    it to return `0` instead of `-1` when no limit is computed from the
    system to avoid forcing response files.

    Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>

--- Source/cmNinjaNormalTargetGenerator.cxx
+++ Source/cmNinjaNormalTargetGenerator.cxx
@@ -354,7 +354,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
   size_t const arrSz = cmArraySize(limits);
   int const sz = *std::min_element(limits, limits + arrSz);
   if (sz == std::numeric_limits<int>::max()) {
-    return -1;
+    return 0;
   }
 
   return sz - linkRuleLength;




%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
%%DATADIR%%/Modules/CMakeTestWatcomVersion.c
%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
%%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
%%DATADIR%%/Modules/CMakeVerifyManifest.cmake
%%DATADIR%%/Modules/CPack.DS_Store.in

%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Bruce-C.cmake
%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake

%%DATADIR%%/Modules/Compiler/GHS-C.cmake
%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/GHS.cmake
%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/GNU-C.cmake

%%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
%%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
%%DATADIR%%/Modules/Compiler/Intel-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/Intel-C.cmake
%%DATADIR%%/Modules/Compiler/Intel-CXX-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake

%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
%%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in
%%DATADIR%%/Modules/CompilerId/VS-6.dsp.in
%%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in
%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in
%%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in

%%DATADIR%%/Modules/DummyCXXFile.cxx
%%DATADIR%%/Modules/ExternalData.cmake
%%DATADIR%%/Modules/ExternalData_config.cmake.in
%%DATADIR%%/Modules/ExternalProject-download.cmake.in
%%DATADIR%%/Modules/ExternalProject-verify.cmake.in
%%DATADIR%%/Modules/ExternalProject.cmake
%%DATADIR%%/Modules/FLTKCompatibility.cmake
%%DATADIR%%/Modules/FeatureSummary.cmake

%%DATADIR%%/Modules/FindKDE4.cmake
%%DATADIR%%/Modules/FindLAPACK.cmake
%%DATADIR%%/Modules/FindLATEX.cmake
%%DATADIR%%/Modules/FindLTTngUST.cmake
%%DATADIR%%/Modules/FindLibArchive.cmake
%%DATADIR%%/Modules/FindLibLZMA.cmake
%%DATADIR%%/Modules/FindLibXml2.cmake

%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
%%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-CXX.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-Clang-C.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-Clang-CXX.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake

%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake
%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake
%%DATADIR%%/Modules/Platform/SunOS-PathScale-C.cmake
%%DATADIR%%/Modules/Platform/SunOS-PathScale-CXX.cmake
%%DATADIR%%/Modules/Platform/SunOS-PathScale-Fortran.cmake
%%DATADIR%%/Modules/Platform/SunOS-PathScale.cmake
%%DATADIR%%/Modules/Platform/SunOS.cmake
%%DATADIR%%/Modules/Platform/Tru64.cmake
%%DATADIR%%/Modules/Platform/ULTRIX.cmake

%%DATADIR%%/Templates/AppleInfo.plist
%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
%%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake
%%DATADIR%%/Templates/CPack.GenericDescription.txt
%%DATADIR%%/Templates/CPack.GenericLicense.txt
%%DATADIR%%/Templates/CPack.GenericWelcome.txt
%%DATADIR%%/Templates/CPackConfig.cmake.in
%%DATADIR%%/Templates/CTestScript.cmake.in
%%DATADIR%%/Templates/DLLFooter.dsptemplate
%%DATADIR%%/Templates/DLLHeader.dsptemplate
%%DATADIR%%/Templates/EXEFooter.dsptemplate
%%DATADIR%%/Templates/EXEHeader.dsptemplate
%%DATADIR%%/Templates/EXEWinHeader.dsptemplate
%%DATADIR%%/Templates/TestDriver.cxx.in
%%DATADIR%%/Templates/UtilityFooter.dsptemplate
%%DATADIR%%/Templates/UtilityHeader.dsptemplate
%%DATADIR%%/Templates/Windows/ApplicationIcon.png
%%DATADIR%%/Templates/Windows/Logo.png
%%DATADIR%%/Templates/Windows/SmallLogo.png

%%DATADIR%%/Templates/Windows/StoreLogo.png
%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
%%DATADIR%%/Templates/cygwin-package.sh.in
%%DATADIR%%/Templates/staticLibFooter.dsptemplate
%%DATADIR%%/Templates/staticLibHeader.dsptemplate

Lines 2-9 Link Here

(-)b/devel/cmake/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	PORTVERSION= 3.5.2	5	PORTVERSION= 3.6.0
6	PORTREVISION?= 2	6	PORTREVISION?= 0
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	8	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
9		9

Lines 1-2 Link Here

(-)b/devel/cmake/distinfo (-2 / +3 lines)
1	SHA256 (cmake-3.5.2.tar.gz) = 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a	1	TIMESTAMP = 1468174823
2	SIZE (cmake-3.5.2.tar.gz) = 6863498	2	SHA256 (cmake-3.6.0.tar.gz) = fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670
		3	SIZE (cmake-3.6.0.tar.gz) = 6897636




Required by CMake 3.6.0 for ImageMagick and other programs to be found.

commit 54475018ae3ea04558b5372bc270e7c08af723f4
Author: Brad King <brad.king@kitware.com>
Date:   Mon Jul 11 10:21:38 2016 -0400

    Restore find_(library|file|path) search of PATH itself

    The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path)
    prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped
    search of the entries in PATH itself in addition to the prefixes derived
    from it.  This regresses find modules that (incorrectly) depended on the
    behavior, including some of our own modules such as FindImageMagick.

    Restore the search of entries in PATH itself.  If we want to drop it
    later we will need to do so with a policy.  Fixes #16192.

--- Source/cmFindBase.cxx
+++ Source/cmFindBase.cxx
@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
     paths.AddEnvPath(this->EnvironmentPath);
 #if defined(_WIN32) || defined(__CYGWIN__)
     paths.AddEnvPrefixPath("PATH", true);
-    paths.AddEnvPath("PATH");
 #endif
-  } else {
-    // Add PATH
-    paths.AddEnvPath("PATH");
   }
+  // Add PATH
+  paths.AddEnvPath("PATH");
   paths.AddSuffixes(this->SearchPathSuffixes);
 }
 




While not strictly necessary because of patch-git_86dd2427, this patch helps
CMake determine the maximum size of the command line and determine whether
ninja generator needs to use .rsp files.

commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Fri Jul 15 12:46:53 2016 +0200

    Ninja: Generalize check for sysconf(3) call

    Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
    of hard-coding an incomplete list of operating systems that implement
    it.  In particular, it is available on BSD platforms that were not
    previously listed.

--- Source/cmNinjaNormalTargetGenerator.cxx
+++ Source/cmNinjaNormalTargetGenerator.cxx
@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 #ifdef _WIN32
     8000,
 #endif
-#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
+#if defined(_SC_ARG_MAX)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
     ((int)sysconf(_SC_ARG_MAX)) - 1000,
 #endif




This patch allows the ninja generator to work without forcing the use of .rsp
files, which cause problems for ar(1) which does not recognize the @file
syntax.

commit 86dd2427bcb7cd1d912fc802f70b15556e776d62
Author: Brad King <brad.king@kitware.com>
Date:   Fri Jul 15 09:37:03 2016 -0400

    Ninja: Do not force response files when no sysconf(3) limit is used

    Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
    forcing use of response files, 2016-04-06) started using negative
    command line length values to represent forced use of response files but
    forgot to update `calculateCommandLineLengthLimit()` accordingly.  Teach
    it to return `0` instead of `-1` when no limit is computed from the
    system to avoid forcing response files.

    Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>

--- Source/cmNinjaNormalTargetGenerator.cxx
+++ Source/cmNinjaNormalTargetGenerator.cxx
@@ -354,7 +354,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
   size_t const arrSz = cmArraySize(limits);
   int const sz = *std::min_element(limits, limits + arrSz);
   if (sz == std::numeric_limits<int>::max()) {
-    return -1;
+    return 0;
   }
 
   return sz - linkRuleLength;




This patch makes science/InsightToolkit build with CMake 3.6.0, which otherwise
fails to find all required HDF5 libraries.

commit 87c1cd9c517bb57a537ba1f75548e6c20966553d
Author: Chuck Atkins <chuck.atkins@kitware.com>
Date:   Mon Jul 11 11:26:24 2016 -0400

    FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac

--- Modules/FindHDF5.cmake
+++ Modules/FindHDF5.cmake
@@ -267,8 +267,21 @@ endfunction()
 # return_value argument, the text output is stored to the output variable.
 macro( _HDF5_invoke_compiler language output return_value version)
     set(${version})
+    if(HDF5_USE_STATIC_LIBRARIES)
+        set(lib_type_args -noshlib)
+    else()
+        set(lib_type_args -shlib)
+    endif()
+    set(scratch_dir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5)
+    if("${language}" STREQUAL "C")
+        set(test_file ${scratch_dir}/cmake_hdf5_test.c)
+    elseif("${language}" STREQUAL "CXX")
+        set(test_file ${scratch_dir}/cmake_hdf5_test.cxx)
+    elseif("${language}" STREQUAL "Fortran")
+        set(test_file ${scratch_dir}/cmake_hdf5_test.f90)
+    endif()
     exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE}
-        ARGS -show
+        ARGS -show ${lib_type_args} ${test_file}
         OUTPUT_VARIABLE ${output}
         RETURN_VALUE ${return_value}
     )
@@ -302,44 +315,59 @@ macro( _HDF5_parse_compile_line
     libraries_hl)
 
     # Match the include paths
-    string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags
-        "${${compile_line_var}}"
-    )
-    foreach( IPATH ${include_path_flags} )
-        string( REGEX REPLACE "^-I" "" IPATH ${IPATH} )
-        string( REPLACE "//" "/" IPATH ${IPATH} )
+    set( RE " -I *([^\" ]+|\"[^\"]+\")")
+    string( REGEX MATCHALL "${RE}" include_path_flags "${${compile_line_var}}")
+    foreach( IPATH IN LISTS include_path_flags )
+        string( REGEX REPLACE "${RE}" "\\1" IPATH "${IPATH}" )
         list( APPEND ${include_paths} ${IPATH} )
     endforeach()
 
     # Match the definitions
-    string( REGEX MATCHALL "-D[^ ]*" definition_flags "${${compile_line_var}}" )
-    foreach( DEF ${definition_flags} )
+    set( RE " -D([^ ]*)")
+    string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" )
+    foreach( DEF IN LISTS definition_flags )
+        string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" )
         list( APPEND ${definitions} ${DEF} )
     endforeach()
 
     # Match the library paths
-    string( REGEX MATCHALL "-L([^\" ]+|\"[^\"]+\")" library_path_flags
-        "${${compile_line_var}}"
-    )
-
-    foreach( LPATH ${library_path_flags} )
-        string( REGEX REPLACE "^-L" "" LPATH ${LPATH} )
-        string( REPLACE "//" "/" LPATH ${LPATH} )
+    set( RE " -L *([^\" ]+|\"[^\"]+\")")
+    string( REGEX MATCHALL "${RE}" library_path_flags "${${compile_line_var}}")
+    foreach( LPATH IN LISTS library_path_flags )
+        string( REGEX REPLACE "${RE}" "\\1" LPATH "${LPATH}" )
         list( APPEND ${library_paths} ${LPATH} )
     endforeach()
 
-    # now search for the library names specified in the compile line (match -l...)
+    # now search for the lib names specified in the compile line (match -l...)
     # match only -l's preceded by a space or comma
-    # this is to exclude directory names like xxx-linux/
-    string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags
-        "${${compile_line_var}}" )
-    # strip the -l from all of the library flags and add to the search list
-    foreach( LIB ${library_name_flags} )
-        string( REGEX REPLACE "^[, ]-l" "" LIB ${LIB} )
-        if(LIB MATCHES ".*_hl")
-            list(APPEND ${libraries_hl} ${LIB})
+    set( RE " -l *([^\" ]+|\"[^\"]+\")")
+    string( REGEX MATCHALL "${RE}" library_name_flags "${${compile_line_var}}")
+    foreach( LNAME IN LISTS library_name_flags )
+        string( REGEX REPLACE "${RE}" "\\1" LNAME "${LNAME}" )
+        if(LNAME MATCHES ".*hl")
+            list(APPEND ${libraries_hl} ${LNAME})
         else()
-            list(APPEND ${libraries} ${LIB})
+            list(APPEND ${libraries} ${LNAME})
+        endif()
+    endforeach()
+
+    # now search for full library paths with no flags
+    set( RE " ([^\" ]+|\"[^\"]+\")")
+    string( REGEX MATCHALL "${RE}" library_name_noflags "${${compile_line_var}}")
+    foreach( LIB IN LISTS library_name_noflags )
+        string( REGEX REPLACE "${RE}" "\\1" LIB "${LIB}" )
+        get_filename_component(LIB "${LIB}" ABSOLUTE)
+        if(NOT EXISTS ${LIB} OR IS_DIRECTORY ${LIB})
+            continue()
+        endif()
+        get_filename_component(LPATH ${LIB} DIRECTORY)
+        get_filename_component(LNAME ${LIB} NAME_WE)
+        string( REGEX REPLACE "^lib" "" LNAME ${LNAME} )
+        list( APPEND ${library_paths} ${LPATH} )
+        if(LNAME MATCHES ".*hl")
+            list(APPEND ${libraries_hl} ${LNAME})
+        else()
+            list(APPEND ${libraries} ${LNAME})
         endif()
     endforeach()
 endmacro()
@@ -459,6 +487,14 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
             HDF5_${__lang}_HL_LIBRARY_NAMES
           )
           set(HDF5_${__lang}_LIBRARIES)
+
+          set(_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+          if(HDF5_USE_STATIC_LIBRARIES)
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+          else()
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
+          endif()
+
           foreach(L IN LISTS HDF5_${__lang}_LIBRARY_NAMES)
             find_library(HDF5_${__lang}_LIBRARY_${L} ${L} ${HDF5_${__lang}_LIBRARY_DIRS})
             if(HDF5_${__lang}_LIBRARY_${L})
@@ -478,6 +514,9 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
               endif()
             endforeach()
           endif()
+
+          set(CMAKE_FIND_LIBRARY_SUFFIXES ${_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES})
+
           set(HDF5_${__lang}_FOUND True)
           mark_as_advanced(HDF5_${__lang}_DEFINITIONS)
           mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS)




%%DATADIR%%/Help/module/FindKDE4.rst
%%DATADIR%%/Help/module/FindLAPACK.rst
%%DATADIR%%/Help/module/FindLATEX.rst
%%DATADIR%%/Help/module/FindLTTngUST.rst
%%DATADIR%%/Help/module/FindLibArchive.rst
%%DATADIR%%/Help/module/FindLibLZMA.rst
%%DATADIR%%/Help/module/FindLibXml2.rst

%%DATADIR%%/Help/prop_dir/VARIABLES.rst
%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
%%DATADIR%%/Help/prop_dir/VS_STARTUP_PROJECT.rst
%%DATADIR%%/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
%%DATADIR%%/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
%%DATADIR%%/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst

%%DATADIR%%/Help/prop_test/RUN_SERIAL.rst
%%DATADIR%%/Help/prop_test/SKIP_RETURN_CODE.rst
%%DATADIR%%/Help/prop_test/TIMEOUT.rst
%%DATADIR%%/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
%%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/C_STANDARD_REQUIRED.rst
%%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
%%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
%%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst

%%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_CLANG_TIDY.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/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_DESKTOP_EXTENSIONS_VERSION.rst
%%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
%%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst

%%DATADIR%%/Help/release/3.3.rst
%%DATADIR%%/Help/release/3.4.rst
%%DATADIR%%/Help/release/3.5.rst
%%DATADIR%%/Help/release/3.6.rst
%%DATADIR%%/Help/release/dev.txt
%%DATADIR%%/Help/release/index.rst
%%DATADIR%%/Help/variable/APPLE.rst

%%DATADIR%%/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
%%DATADIR%%/Help/variable/CMAKE_DEBUG_POSTFIX.rst
%%DATADIR%%/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
%%DATADIR%%/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
%%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
%%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst
%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_VERSION.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_GNUtoMS.rst
%%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SOLARIS.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst

%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst

%%DATADIR%%/Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_VISIBILITY_PRESET.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst

%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst
%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
%%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
%%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
%%DATADIR%%/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst

%%DATADIR%%/Help/variable/CMAKE_SKIP_RPATH.rst
%%DATADIR%%/Help/variable/CMAKE_SOURCE_DIR.rst
%%DATADIR%%/Help/variable/CMAKE_STAGING_PREFIX.rst
%%DATADIR%%/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst
%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst
%%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst

%%DATADIR%%/Help/variable/CMAKE_SYSTEM_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
%%DATADIR%%/Help/variable/CMAKE_TWEAK_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst

%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
%%DATADIR%%/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
%%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/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_INIT_SUBMODULES.rst
%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
%%DATADIR%%/Help/variable/CTEST_HG_COMMAND.rst

Return to bug 210988

Added Link Here

(-)b/devel/cmake-gui/files/patch-git_54475018 (+34 lines)
1	Required by CMake 3.6.0 for ImageMagick and other programs to be found.
2
3	commit 54475018ae3ea04558b5372bc270e7c08af723f4
4	Author: Brad King <brad.king@kitware.com>
5	Date: Mon Jul 11 10:21:38 2016 -0400
6
7	Restore find_(library\|file\|path) search of PATH itself
8
9	The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library\|file\|path)
10	prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped
11	search of the entries in PATH itself in addition to the prefixes derived
12	from it. This regresses find modules that (incorrectly) depended on the
13	behavior, including some of our own modules such as FindImageMagick.
14
15	Restore the search of entries in PATH itself. If we want to drop it
16	later we will need to do so with a policy. Fixes #16192.
17
18	--- Source/cmFindBase.cxx
19	+++ Source/cmFindBase.cxx
20	@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
21	paths.AddEnvPath(this->EnvironmentPath);
22	#if defined(_WIN32) \|\| defined(__CYGWIN__)
23	paths.AddEnvPrefixPath("PATH", true);
24	- paths.AddEnvPath("PATH");
25	#endif
26	- } else {
27	- // Add PATH
28	- paths.AddEnvPath("PATH");
29	}
30	+ // Add PATH
31	+ paths.AddEnvPath("PATH");
32	paths.AddSuffixes(this->SearchPathSuffixes);
33	}
34

Added Link Here

(-)b/devel/cmake-gui/files/patch-git_5ec17e61 (+26 lines)
1	While not strictly necessary because of patch-git_86dd2427, this patch helps
2	CMake determine the maximum size of the command line and determine whether
3	ninja generator needs to use .rsp files.
4
5	commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
6	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
7	Date: Fri Jul 15 12:46:53 2016 +0200
8
9	Ninja: Generalize check for sysconf(3) call
10
11	Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
12	of hard-coding an incomplete list of operating systems that implement
13	it. In particular, it is available on BSD platforms that were not
14	previously listed.
15
16	--- Source/cmNinjaNormalTargetGenerator.cxx
17	+++ Source/cmNinjaNormalTargetGenerator.cxx
18	@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
19	#ifdef _WIN32
20	8000,
21	#endif
22	-#if defined(__APPLE__) \|\| defined(__HAIKU__) \|\| defined(__linux)
23	+#if defined(_SC_ARG_MAX)
24	// for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
25	((int)sysconf(_SC_ARG_MAX)) - 1000,
26	#endif

Added Link Here

(-)b/devel/cmake-gui/files/patch-git_86dd2427 (+30 lines)
1	This patch allows the ninja generator to work without forcing the use of .rsp
2	files, which cause problems for ar(1) which does not recognize the @file
3	syntax.
4
5	commit 86dd2427bcb7cd1d912fc802f70b15556e776d62
6	Author: Brad King <brad.king@kitware.com>
7	Date: Fri Jul 15 09:37:03 2016 -0400
8
9	Ninja: Do not force response files when no sysconf(3) limit is used
10
11	Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
12	forcing use of response files, 2016-04-06) started using negative
13	command line length values to represent forced use of response files but
14	forgot to update `calculateCommandLineLengthLimit()` accordingly. Teach
15	it to return `0` instead of `-1` when no limit is computed from the
16	system to avoid forcing response files.
17
18	Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
19
20	--- Source/cmNinjaNormalTargetGenerator.cxx
21	+++ Source/cmNinjaNormalTargetGenerator.cxx
22	@@ -354,7 +354,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
23	size_t const arrSz = cmArraySize(limits);
24	int const sz = *std::min_element(limits, limits + arrSz);
25	if (sz == std::numeric_limits<int>::max()) {
26	- return -1;
27	+ return 0;
28	}
29
30	return sz - linkRuleLength;

Lines 105-113 Link Here

(-)b/devel/cmake-modules/pkg-plist (-13 / +14 lines)
105	%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake	105	%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
106	%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake	106	%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
107	%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake	107	%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
108	%%DATADIR%%/Modules/CMakeTestWatcomVersion.c
109	%%DATADIR%%/Modules/CMakeUnixFindMake.cmake	108	%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
110	%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
111	%%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake	109	%%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
112	%%DATADIR%%/Modules/CMakeVerifyManifest.cmake	110	%%DATADIR%%/Modules/CMakeVerifyManifest.cmake
113	%%DATADIR%%/Modules/CPack.DS_Store.in	111	%%DATADIR%%/Modules/CPack.DS_Store.in
Lines 184-189 Link Here
184	%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake	182	%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
185	%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake	183	%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
186	%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake	184	%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
		185	%%DATADIR%%/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
		186	%%DATADIR%%/Modules/Compiler/Bruce-C.cmake
187	%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake	187	%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
188	%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake	188	%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
189	%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake	189	%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
Lines 223-228 Link Here
223	%%DATADIR%%/Modules/Compiler/GHS-C.cmake	223	%%DATADIR%%/Modules/Compiler/GHS-C.cmake
224	%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake	224	%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
225	%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake	225	%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
		226	%%DATADIR%%/Modules/Compiler/GHS.cmake
226	%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake	227	%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
227	%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake	228	%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
228	%%DATADIR%%/Modules/Compiler/GNU-C.cmake	229	%%DATADIR%%/Modules/Compiler/GNU-C.cmake
Lines 245-251 Link Here
245	%%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake	246	%%DATADIR%%/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
246	%%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake	247	%%DATADIR%%/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
247	%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake	248	%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
		249	%%DATADIR%%/Modules/Compiler/Intel-C-FeatureTests.cmake
248	%%DATADIR%%/Modules/Compiler/Intel-C.cmake	250	%%DATADIR%%/Modules/Compiler/Intel-C.cmake
		251	%%DATADIR%%/Modules/Compiler/Intel-CXX-FeatureTests.cmake
249	%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake	252	%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
250	%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake	253	%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
251	%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake	254	%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
Lines 305-311 Link Here
305	%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake	308	%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
306	%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake	309	%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
307	%%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in	310	%%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in
308	%%DATADIR%%/Modules/CompilerId/VS-6.dsp.in
309	%%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in	311	%%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in
310	%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in	312	%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in
311	%%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in	313	%%DATADIR%%/Modules/CompilerId/VS-NsightTegra.vcxproj.in
Lines 320-325 Link Here
320	%%DATADIR%%/Modules/DummyCXXFile.cxx	322	%%DATADIR%%/Modules/DummyCXXFile.cxx
321	%%DATADIR%%/Modules/ExternalData.cmake	323	%%DATADIR%%/Modules/ExternalData.cmake
322	%%DATADIR%%/Modules/ExternalData_config.cmake.in	324	%%DATADIR%%/Modules/ExternalData_config.cmake.in
		325	%%DATADIR%%/Modules/ExternalProject-download.cmake.in
		326	%%DATADIR%%/Modules/ExternalProject-verify.cmake.in
323	%%DATADIR%%/Modules/ExternalProject.cmake	327	%%DATADIR%%/Modules/ExternalProject.cmake
324	%%DATADIR%%/Modules/FLTKCompatibility.cmake	328	%%DATADIR%%/Modules/FLTKCompatibility.cmake
325	%%DATADIR%%/Modules/FeatureSummary.cmake	329	%%DATADIR%%/Modules/FeatureSummary.cmake
Lines 384-389 Link Here
384	%%DATADIR%%/Modules/FindKDE4.cmake	388	%%DATADIR%%/Modules/FindKDE4.cmake
385	%%DATADIR%%/Modules/FindLAPACK.cmake	389	%%DATADIR%%/Modules/FindLAPACK.cmake
386	%%DATADIR%%/Modules/FindLATEX.cmake	390	%%DATADIR%%/Modules/FindLATEX.cmake
		391	%%DATADIR%%/Modules/FindLTTngUST.cmake
387	%%DATADIR%%/Modules/FindLibArchive.cmake	392	%%DATADIR%%/Modules/FindLibArchive.cmake
388	%%DATADIR%%/Modules/FindLibLZMA.cmake	393	%%DATADIR%%/Modules/FindLibLZMA.cmake
389	%%DATADIR%%/Modules/FindLibXml2.cmake	394	%%DATADIR%%/Modules/FindLibXml2.cmake
Lines 558-563 Link Here
558	%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake	563	%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
559	%%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake	564	%%DATADIR%%/Modules/Platform/BlueGeneQ-static.cmake
560	%%DATADIR%%/Modules/Platform/CYGWIN-CXX.cmake	565	%%DATADIR%%/Modules/Platform/CYGWIN-CXX.cmake
		566	%%DATADIR%%/Modules/Platform/CYGWIN-Clang-C.cmake
		567	%%DATADIR%%/Modules/Platform/CYGWIN-Clang-CXX.cmake
561	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake	568	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
562	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake	569	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
563	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake	570	%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake
Lines 662-667 Link Here
662	%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake	669	%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake
663	%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake	670	%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake
664	%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake	671	%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake
		672	%%DATADIR%%/Modules/Platform/SunOS-PathScale-C.cmake
		673	%%DATADIR%%/Modules/Platform/SunOS-PathScale-CXX.cmake
		674	%%DATADIR%%/Modules/Platform/SunOS-PathScale-Fortran.cmake
		675	%%DATADIR%%/Modules/Platform/SunOS-PathScale.cmake
665	%%DATADIR%%/Modules/Platform/SunOS.cmake	676	%%DATADIR%%/Modules/Platform/SunOS.cmake
666	%%DATADIR%%/Modules/Platform/Tru64.cmake	677	%%DATADIR%%/Modules/Platform/Tru64.cmake
667	%%DATADIR%%/Modules/Platform/ULTRIX.cmake	678	%%DATADIR%%/Modules/Platform/ULTRIX.cmake
Lines 757-776 Link Here
757	%%DATADIR%%/Templates/AppleInfo.plist	768	%%DATADIR%%/Templates/AppleInfo.plist
758	%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros	769	%%DATADIR%%/Templates/CMakeVSMacros1.vsmacros
759	%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros	770	%%DATADIR%%/Templates/CMakeVSMacros2.vsmacros
760	%%DATADIR%%/Templates/CMakeVisualStudio6Configurations.cmake
761	%%DATADIR%%/Templates/CPack.GenericDescription.txt	771	%%DATADIR%%/Templates/CPack.GenericDescription.txt
762	%%DATADIR%%/Templates/CPack.GenericLicense.txt	772	%%DATADIR%%/Templates/CPack.GenericLicense.txt
763	%%DATADIR%%/Templates/CPack.GenericWelcome.txt	773	%%DATADIR%%/Templates/CPack.GenericWelcome.txt
764	%%DATADIR%%/Templates/CPackConfig.cmake.in	774	%%DATADIR%%/Templates/CPackConfig.cmake.in
765	%%DATADIR%%/Templates/CTestScript.cmake.in	775	%%DATADIR%%/Templates/CTestScript.cmake.in
766	%%DATADIR%%/Templates/DLLFooter.dsptemplate
767	%%DATADIR%%/Templates/DLLHeader.dsptemplate
768	%%DATADIR%%/Templates/EXEFooter.dsptemplate
769	%%DATADIR%%/Templates/EXEHeader.dsptemplate
770	%%DATADIR%%/Templates/EXEWinHeader.dsptemplate
771	%%DATADIR%%/Templates/TestDriver.cxx.in	776	%%DATADIR%%/Templates/TestDriver.cxx.in
772	%%DATADIR%%/Templates/UtilityFooter.dsptemplate
773	%%DATADIR%%/Templates/UtilityHeader.dsptemplate
774	%%DATADIR%%/Templates/Windows/ApplicationIcon.png	777	%%DATADIR%%/Templates/Windows/ApplicationIcon.png
775	%%DATADIR%%/Templates/Windows/Logo.png	778	%%DATADIR%%/Templates/Windows/Logo.png
776	%%DATADIR%%/Templates/Windows/SmallLogo.png	779	%%DATADIR%%/Templates/Windows/SmallLogo.png
Lines 779-783 Link Here
779	%%DATADIR%%/Templates/Windows/StoreLogo.png	782	%%DATADIR%%/Templates/Windows/StoreLogo.png
780	%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx	783	%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx
781	%%DATADIR%%/Templates/cygwin-package.sh.in	784	%%DATADIR%%/Templates/cygwin-package.sh.in
782	%%DATADIR%%/Templates/staticLibFooter.dsptemplate
783	%%DATADIR%%/Templates/staticLibHeader.dsptemplate

Added Link Here

(-)b/devel/cmake/files/patch-git_54475018 (+34 lines)
1	Required by CMake 3.6.0 for ImageMagick and other programs to be found.
2
3	commit 54475018ae3ea04558b5372bc270e7c08af723f4
4	Author: Brad King <brad.king@kitware.com>
5	Date: Mon Jul 11 10:21:38 2016 -0400
6
7	Restore find_(library\|file\|path) search of PATH itself
8
9	The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library\|file\|path)
10	prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped
11	search of the entries in PATH itself in addition to the prefixes derived
12	from it. This regresses find modules that (incorrectly) depended on the
13	behavior, including some of our own modules such as FindImageMagick.
14
15	Restore the search of entries in PATH itself. If we want to drop it
16	later we will need to do so with a policy. Fixes #16192.
17
18	--- Source/cmFindBase.cxx
19	+++ Source/cmFindBase.cxx
20	@@ -226,12 +226,10 @@ void cmFindBase::FillSystemEnvironmentPath()
21	paths.AddEnvPath(this->EnvironmentPath);
22	#if defined(_WIN32) \|\| defined(__CYGWIN__)
23	paths.AddEnvPrefixPath("PATH", true);
24	- paths.AddEnvPath("PATH");
25	#endif
26	- } else {
27	- // Add PATH
28	- paths.AddEnvPath("PATH");
29	}
30	+ // Add PATH
31	+ paths.AddEnvPath("PATH");
32	paths.AddSuffixes(this->SearchPathSuffixes);
33	}
34

Added Link Here

(-)b/devel/cmake/files/patch-git_5ec17e61 (+26 lines)
1	While not strictly necessary because of patch-git_86dd2427, this patch helps
2	CMake determine the maximum size of the command line and determine whether
3	ninja generator needs to use .rsp files.
4
5	commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
6	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
7	Date: Fri Jul 15 12:46:53 2016 +0200
8
9	Ninja: Generalize check for sysconf(3) call
10
11	Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
12	of hard-coding an incomplete list of operating systems that implement
13	it. In particular, it is available on BSD platforms that were not
14	previously listed.
15
16	--- Source/cmNinjaNormalTargetGenerator.cxx
17	+++ Source/cmNinjaNormalTargetGenerator.cxx
18	@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
19	#ifdef _WIN32
20	8000,
21	#endif
22	-#if defined(__APPLE__) \|\| defined(__HAIKU__) \|\| defined(__linux)
23	+#if defined(_SC_ARG_MAX)
24	// for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
25	((int)sysconf(_SC_ARG_MAX)) - 1000,
26	#endif

Added Link Here

(-)b/devel/cmake/files/patch-git_86dd2427 (+30 lines)
1	This patch allows the ninja generator to work without forcing the use of .rsp
2	files, which cause problems for ar(1) which does not recognize the @file
3	syntax.
4
5	commit 86dd2427bcb7cd1d912fc802f70b15556e776d62
6	Author: Brad King <brad.king@kitware.com>
7	Date: Fri Jul 15 09:37:03 2016 -0400
8
9	Ninja: Do not force response files when no sysconf(3) limit is used
10
11	Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
12	forcing use of response files, 2016-04-06) started using negative
13	command line length values to represent forced use of response files but
14	forgot to update `calculateCommandLineLengthLimit()` accordingly. Teach
15	it to return `0` instead of `-1` when no limit is computed from the
16	system to avoid forcing response files.
17
18	Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
19
20	--- Source/cmNinjaNormalTargetGenerator.cxx
21	+++ Source/cmNinjaNormalTargetGenerator.cxx
22	@@ -354,7 +354,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
23	size_t const arrSz = cmArraySize(limits);
24	int const sz = *std::min_element(limits, limits + arrSz);
25	if (sz == std::numeric_limits<int>::max()) {
26	- return -1;
27	+ return 0;
28	}
29
30	return sz - linkRuleLength;

Added Link Here

(-)b/devel/cmake/files/patch-git_87c1cd9 (+144 lines)
1	This patch makes science/InsightToolkit build with CMake 3.6.0, which otherwise
2	fails to find all required HDF5 libraries.
3
4	commit 87c1cd9c517bb57a537ba1f75548e6c20966553d
5	Author: Chuck Atkins <chuck.atkins@kitware.com>
6	Date: Mon Jul 11 11:26:24 2016 -0400
7
8	FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac
9
10	--- Modules/FindHDF5.cmake
11	+++ Modules/FindHDF5.cmake
12	@@ -267,8 +267,21 @@ endfunction()
13	# return_value argument, the text output is stored to the output variable.
14	macro( _HDF5_invoke_compiler language output return_value version)
15	set(${version})
16	+ if(HDF5_USE_STATIC_LIBRARIES)
17	+ set(lib_type_args -noshlib)
18	+ else()
19	+ set(lib_type_args -shlib)
20	+ endif()
21	+ set(scratch_dir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5)
22	+ if("${language}" STREQUAL "C")
23	+ set(test_file ${scratch_dir}/cmake_hdf5_test.c)
24	+ elseif("${language}" STREQUAL "CXX")
25	+ set(test_file ${scratch_dir}/cmake_hdf5_test.cxx)
26	+ elseif("${language}" STREQUAL "Fortran")
27	+ set(test_file ${scratch_dir}/cmake_hdf5_test.f90)
28	+ endif()
29	exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE}
30	- ARGS -show
31	+ ARGS -show ${lib_type_args} ${test_file}
32	OUTPUT_VARIABLE ${output}
33	RETURN_VALUE ${return_value}
34	)
35	@@ -302,44 +315,59 @@ macro( _HDF5_parse_compile_line
36	libraries_hl)
37
38	# Match the include paths
39	- string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags
40	- "${${compile_line_var}}"
41	- )
42	- foreach( IPATH ${include_path_flags} )
43	- string( REGEX REPLACE "^-I" "" IPATH ${IPATH} )
44	- string( REPLACE "//" "/" IPATH ${IPATH} )
45	+ set( RE " -I *([^\" ]+\|\"[^\"]+\")")
46	+ string( REGEX MATCHALL "${RE}" include_path_flags "${${compile_line_var}}")
47	+ foreach( IPATH IN LISTS include_path_flags )
48	+ string( REGEX REPLACE "${RE}" "\\1" IPATH "${IPATH}" )
49	list( APPEND ${include_paths} ${IPATH} )
50	endforeach()
51
52	# Match the definitions
53	- string( REGEX MATCHALL "-D[^ ]*" definition_flags "${${compile_line_var}}" )
54	- foreach( DEF ${definition_flags} )
55	+ set( RE " -D([^ ]*)")
56	+ string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" )
57	+ foreach( DEF IN LISTS definition_flags )
58	+ string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" )
59	list( APPEND ${definitions} ${DEF} )
60	endforeach()
61
62	# Match the library paths
63	- string( REGEX MATCHALL "-L([^\" ]+\|\"[^\"]+\")" library_path_flags
64	- "${${compile_line_var}}"
65	- )
66	-
67	- foreach( LPATH ${library_path_flags} )
68	- string( REGEX REPLACE "^-L" "" LPATH ${LPATH} )
69	- string( REPLACE "//" "/" LPATH ${LPATH} )
70	+ set( RE " -L *([^\" ]+\|\"[^\"]+\")")
71	+ string( REGEX MATCHALL "${RE}" library_path_flags "${${compile_line_var}}")
72	+ foreach( LPATH IN LISTS library_path_flags )
73	+ string( REGEX REPLACE "${RE}" "\\1" LPATH "${LPATH}" )
74	list( APPEND ${library_paths} ${LPATH} )
75	endforeach()
76
77	- # now search for the library names specified in the compile line (match -l...)
78	+ # now search for the lib names specified in the compile line (match -l...)
79	# match only -l's preceded by a space or comma
80	- # this is to exclude directory names like xxx-linux/
81	- string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags
82	- "${${compile_line_var}}" )
83	- # strip the -l from all of the library flags and add to the search list
84	- foreach( LIB ${library_name_flags} )
85	- string( REGEX REPLACE "^[, ]-l" "" LIB ${LIB} )
86	- if(LIB MATCHES ".*_hl")
87	- list(APPEND ${libraries_hl} ${LIB})
88	+ set( RE " -l *([^\" ]+\|\"[^\"]+\")")
89	+ string( REGEX MATCHALL "${RE}" library_name_flags "${${compile_line_var}}")
90	+ foreach( LNAME IN LISTS library_name_flags )
91	+ string( REGEX REPLACE "${RE}" "\\1" LNAME "${LNAME}" )
92	+ if(LNAME MATCHES ".*hl")
93	+ list(APPEND ${libraries_hl} ${LNAME})
94	else()
95	- list(APPEND ${libraries} ${LIB})
96	+ list(APPEND ${libraries} ${LNAME})
97	+ endif()
98	+ endforeach()
99	+
100	+ # now search for full library paths with no flags
101	+ set( RE " ([^\" ]+\|\"[^\"]+\")")
102	+ string( REGEX MATCHALL "${RE}" library_name_noflags "${${compile_line_var}}")
103	+ foreach( LIB IN LISTS library_name_noflags )
104	+ string( REGEX REPLACE "${RE}" "\\1" LIB "${LIB}" )
105	+ get_filename_component(LIB "${LIB}" ABSOLUTE)
106	+ if(NOT EXISTS ${LIB} OR IS_DIRECTORY ${LIB})
107	+ continue()
108	+ endif()
109	+ get_filename_component(LPATH ${LIB} DIRECTORY)
110	+ get_filename_component(LNAME ${LIB} NAME_WE)
111	+ string( REGEX REPLACE "^lib" "" LNAME ${LNAME} )
112	+ list( APPEND ${library_paths} ${LPATH} )
113	+ if(LNAME MATCHES ".*hl")
114	+ list(APPEND ${libraries_hl} ${LNAME})
115	+ else()
116	+ list(APPEND ${libraries} ${LNAME})
117	endif()
118	endforeach()
119	endmacro()
120	@@ -459,6 +487,14 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
121	HDF5_${__lang}_HL_LIBRARY_NAMES
122	)
123	set(HDF5_${__lang}_LIBRARIES)
124	+
125	+ set(_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
126	+ if(HDF5_USE_STATIC_LIBRARIES)
127	+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
128	+ else()
129	+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
130	+ endif()
131	+
132	foreach(L IN LISTS HDF5_${__lang}_LIBRARY_NAMES)
133	find_library(HDF5_${__lang}_LIBRARY_${L} ${L} ${HDF5_${__lang}_LIBRARY_DIRS})
134	if(HDF5_${__lang}_LIBRARY_${L})
135	@@ -478,6 +514,9 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
136	endif()
137	endforeach()
138	endif()
139	+
140	+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES})
141	+
142	set(HDF5_${__lang}_FOUND True)
143	mark_as_advanced(HDF5_${__lang}_DEFINITIONS)
144	mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS)

Lines 309-314 share/aclocal/cmake.m4 Link Here

(-)b/devel/cmake/pkg-plist (-2 / +20 lines)
309	%%DATADIR%%/Help/module/FindKDE4.rst	309	%%DATADIR%%/Help/module/FindKDE4.rst
310	%%DATADIR%%/Help/module/FindLAPACK.rst	310	%%DATADIR%%/Help/module/FindLAPACK.rst
311	%%DATADIR%%/Help/module/FindLATEX.rst	311	%%DATADIR%%/Help/module/FindLATEX.rst
		312	%%DATADIR%%/Help/module/FindLTTngUST.rst
312	%%DATADIR%%/Help/module/FindLibArchive.rst	313	%%DATADIR%%/Help/module/FindLibArchive.rst
313	%%DATADIR%%/Help/module/FindLibLZMA.rst	314	%%DATADIR%%/Help/module/FindLibLZMA.rst
314	%%DATADIR%%/Help/module/FindLibXml2.rst	315	%%DATADIR%%/Help/module/FindLibXml2.rst
Lines 520-525 share/aclocal/cmake.m4 Link Here
520	%%DATADIR%%/Help/prop_dir/VARIABLES.rst	521	%%DATADIR%%/Help/prop_dir/VARIABLES.rst
521	%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst	522	%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
522	%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst	523	%%DATADIR%%/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
		524	%%DATADIR%%/Help/prop_dir/VS_STARTUP_PROJECT.rst
523	%%DATADIR%%/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst	525	%%DATADIR%%/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
524	%%DATADIR%%/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst	526	%%DATADIR%%/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
525	%%DATADIR%%/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst	527	%%DATADIR%%/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
Lines 597-602 share/aclocal/cmake.m4 Link Here
597	%%DATADIR%%/Help/prop_test/RUN_SERIAL.rst	599	%%DATADIR%%/Help/prop_test/RUN_SERIAL.rst
598	%%DATADIR%%/Help/prop_test/SKIP_RETURN_CODE.rst	600	%%DATADIR%%/Help/prop_test/SKIP_RETURN_CODE.rst
599	%%DATADIR%%/Help/prop_test/TIMEOUT.rst	601	%%DATADIR%%/Help/prop_test/TIMEOUT.rst
		602	%%DATADIR%%/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
600	%%DATADIR%%/Help/prop_test/WILL_FAIL.rst	603	%%DATADIR%%/Help/prop_test/WILL_FAIL.rst
601	%%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst	604	%%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst
602	%%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst	605	%%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
Lines 657-662 share/aclocal/cmake.m4 Link Here
657	%%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst	660	%%DATADIR%%/Help/prop_tgt/C_STANDARD_REQUIRED.rst
658	%%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst	661	%%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
659	%%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst	662	%%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
		663	%%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
660	%%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst	664	%%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
661	%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst	665	%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
662	%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst	666	%%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
Lines 712-717 share/aclocal/cmake.m4 Link Here
712	%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst	716	%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
713	%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst	717	%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
714	%%DATADIR%%/Help/prop_tgt/LABELS.rst	718	%%DATADIR%%/Help/prop_tgt/LABELS.rst
		719	%%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY.rst
715	%%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst	720	%%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
716	%%DATADIR%%/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst	721	%%DATADIR%%/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
717	%%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst	722	%%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
Lines 775-780 share/aclocal/cmake.m4 Link Here
775	%%DATADIR%%/Help/prop_tgt/TYPE.rst	780	%%DATADIR%%/Help/prop_tgt/TYPE.rst
776	%%DATADIR%%/Help/prop_tgt/VERSION.rst	781	%%DATADIR%%/Help/prop_tgt/VERSION.rst
777	%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst	782	%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
		783	%%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
778	%%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst	784	%%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
779	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst	785	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
780	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst	786	%%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
Lines 806-811 share/aclocal/cmake.m4 Link Here
806	%%DATADIR%%/Help/release/3.3.rst	812	%%DATADIR%%/Help/release/3.3.rst
807	%%DATADIR%%/Help/release/3.4.rst	813	%%DATADIR%%/Help/release/3.4.rst
808	%%DATADIR%%/Help/release/3.5.rst	814	%%DATADIR%%/Help/release/3.5.rst
		815	%%DATADIR%%/Help/release/3.6.rst
809	%%DATADIR%%/Help/release/dev.txt	816	%%DATADIR%%/Help/release/dev.txt
810	%%DATADIR%%/Help/release/index.rst	817	%%DATADIR%%/Help/release/index.rst
811	%%DATADIR%%/Help/variable/APPLE.rst	818	%%DATADIR%%/Help/variable/APPLE.rst
Lines 879-886 share/aclocal/cmake.m4 Link Here
879	%%DATADIR%%/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst	886	%%DATADIR%%/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
880	%%DATADIR%%/Help/variable/CMAKE_DEBUG_POSTFIX.rst	887	%%DATADIR%%/Help/variable/CMAKE_DEBUG_POSTFIX.rst
881	%%DATADIR%%/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst	888	%%DATADIR%%/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
		889	%%DATADIR%%/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
882	%%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst	890	%%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
883	%%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst	891	%%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst
		892	%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
		893	%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
		894	%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
		895	%%DATADIR%%/Help/variable/CMAKE_ECLIPSE_VERSION.rst
884	%%DATADIR%%/Help/variable/CMAKE_EDIT_COMMAND.rst	896	%%DATADIR%%/Help/variable/CMAKE_EDIT_COMMAND.rst
885	%%DATADIR%%/Help/variable/CMAKE_ENABLE_EXPORTS.rst	897	%%DATADIR%%/Help/variable/CMAKE_ENABLE_EXPORTS.rst
886	%%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst	898	%%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst
Lines 919-924 share/aclocal/cmake.m4 Link Here
919	%%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst	931	%%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst
920	%%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst	932	%%DATADIR%%/Help/variable/CMAKE_HOME_DIRECTORY.rst
921	%%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst	933	%%DATADIR%%/Help/variable/CMAKE_HOST_APPLE.rst
		934	%%DATADIR%%/Help/variable/CMAKE_HOST_SOLARIS.rst
922	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst	935	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM.rst
923	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst	936	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
924	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst	937	%%DATADIR%%/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
Lines 946-951 share/aclocal/cmake.m4 Link Here
946	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst	959	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
947	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst	960	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
948	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst	961	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
		962	%%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
949	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst	963	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
950	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst	964	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
951	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst	965	%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
Lines 983-988 share/aclocal/cmake.m4 Link Here
983	%%DATADIR%%/Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst	997	%%DATADIR%%/Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst
984	%%DATADIR%%/Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst	998	%%DATADIR%%/Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst
985	%%DATADIR%%/Help/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.rst	999	%%DATADIR%%/Help/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.rst
		1000	%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst
		1001	%%DATADIR%%/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
986	%%DATADIR%%/Help/variable/CMAKE_LANG_VISIBILITY_PRESET.rst	1002	%%DATADIR%%/Help/variable/CMAKE_LANG_VISIBILITY_PRESET.rst
987	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst	1003	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
988	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst	1004	%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst
Lines 1010-1015 share/aclocal/cmake.m4 Link Here
1010	%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst	1026	%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst
1011	%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst	1027	%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst
1012	%%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst	1028	%%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
		1029	%%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
1013	%%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst	1030	%%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
1014	%%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst	1031	%%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
1015	%%DATADIR%%/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst	1032	%%DATADIR%%/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst
Lines 1048-1054 share/aclocal/cmake.m4 Link Here
1048	%%DATADIR%%/Help/variable/CMAKE_SKIP_RPATH.rst	1065	%%DATADIR%%/Help/variable/CMAKE_SKIP_RPATH.rst
1049	%%DATADIR%%/Help/variable/CMAKE_SOURCE_DIR.rst	1066	%%DATADIR%%/Help/variable/CMAKE_SOURCE_DIR.rst
1050	%%DATADIR%%/Help/variable/CMAKE_STAGING_PREFIX.rst	1067	%%DATADIR%%/Help/variable/CMAKE_STAGING_PREFIX.rst
1051	%%DATADIR%%/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
1052	%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst	1068	%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst
1053	%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst	1069	%%DATADIR%%/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst
1054	%%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst	1070	%%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst
Lines 1067-1072 share/aclocal/cmake.m4 Link Here
1067	%%DATADIR%%/Help/variable/CMAKE_SYSTEM_VERSION.rst	1083	%%DATADIR%%/Help/variable/CMAKE_SYSTEM_VERSION.rst
1068	%%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst	1084	%%DATADIR%%/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
1069	%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst	1085	%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
		1086	%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
		1087	%%DATADIR%%/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
1070	%%DATADIR%%/Help/variable/CMAKE_TWEAK_VERSION.rst	1088	%%DATADIR%%/Help/variable/CMAKE_TWEAK_VERSION.rst
1071	%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst	1089	%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
1072	%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst	1090	%%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst
Lines 1078-1084 share/aclocal/cmake.m4 Link Here
1078	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst	1096	%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
1079	%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst	1097	%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
1080	%%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst	1098	%%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
1081	%%DATADIR%%/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
1082	%%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst	1099	%%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
1083	%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst	1100	%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
1084	%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst	1101	%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
Lines 1138-1143 share/aclocal/cmake.m4 Link Here
1138	%%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst	1155	%%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst
1139	%%DATADIR%%/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst	1156	%%DATADIR%%/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
1140	%%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst	1157	%%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst
		1158	%%DATADIR%%/Help/variable/CTEST_GIT_INIT_SUBMODULES.rst
1141	%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst	1159	%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
1142	%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst	1160	%%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
1143	%%DATADIR%%/Help/variable/CTEST_HG_COMMAND.rst	1161	%%DATADIR%%/Help/variable/CTEST_HG_COMMAND.rst

Lines 1-4 Link Here

(-)b/devel/cmake-doc/pkg-plist (-11 / +47 lines)
1	%%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch	1	%%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch
		2	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.0.txt
		3	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.1.txt
		4	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.2.txt
		5	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.3.txt
		6	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.4.txt
		7	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.5.txt
		8	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.6.txt
		9	%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/index.txt
2	%%DOCSDIR%%/html/_sources/command/add_compile_options.txt	10	%%DOCSDIR%%/html/_sources/command/add_compile_options.txt
3	%%DOCSDIR%%/html/_sources/command/add_custom_command.txt	11	%%DOCSDIR%%/html/_sources/command/add_custom_command.txt
4	%%DOCSDIR%%/html/_sources/command/add_custom_target.txt	12	%%DOCSDIR%%/html/_sources/command/add_custom_target.txt
Lines 279-284 Link Here
279	%%DOCSDIR%%/html/_sources/module/FindKDE4.txt	287	%%DOCSDIR%%/html/_sources/module/FindKDE4.txt
280	%%DOCSDIR%%/html/_sources/module/FindLAPACK.txt	288	%%DOCSDIR%%/html/_sources/module/FindLAPACK.txt
281	%%DOCSDIR%%/html/_sources/module/FindLATEX.txt	289	%%DOCSDIR%%/html/_sources/module/FindLATEX.txt
		290	%%DOCSDIR%%/html/_sources/module/FindLTTngUST.txt
282	%%DOCSDIR%%/html/_sources/module/FindLibArchive.txt	291	%%DOCSDIR%%/html/_sources/module/FindLibArchive.txt
283	%%DOCSDIR%%/html/_sources/module/FindLibLZMA.txt	292	%%DOCSDIR%%/html/_sources/module/FindLibLZMA.txt
284	%%DOCSDIR%%/html/_sources/module/FindLibXml2.txt	293	%%DOCSDIR%%/html/_sources/module/FindLibXml2.txt
Lines 488-493 Link Here
488	%%DOCSDIR%%/html/_sources/prop_dir/VARIABLES.txt	497	%%DOCSDIR%%/html/_sources/prop_dir/VARIABLES.txt
489	%%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_POST_section.txt	498	%%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_POST_section.txt
490	%%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_PRE_section.txt	499	%%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_PRE_section.txt
		500	%%DOCSDIR%%/html/_sources/prop_dir/VS_STARTUP_PROJECT.txt
491	%%DOCSDIR%%/html/_sources/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.txt	501	%%DOCSDIR%%/html/_sources/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.txt
492	%%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt	502	%%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt
493	%%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt	503	%%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt
Lines 565-570 Link Here
565	%%DOCSDIR%%/html/_sources/prop_test/RUN_SERIAL.txt	575	%%DOCSDIR%%/html/_sources/prop_test/RUN_SERIAL.txt
566	%%DOCSDIR%%/html/_sources/prop_test/SKIP_RETURN_CODE.txt	576	%%DOCSDIR%%/html/_sources/prop_test/SKIP_RETURN_CODE.txt
567	%%DOCSDIR%%/html/_sources/prop_test/TIMEOUT.txt	577	%%DOCSDIR%%/html/_sources/prop_test/TIMEOUT.txt
		578	%%DOCSDIR%%/html/_sources/prop_test/TIMEOUT_AFTER_MATCH.txt
568	%%DOCSDIR%%/html/_sources/prop_test/WILL_FAIL.txt	579	%%DOCSDIR%%/html/_sources/prop_test/WILL_FAIL.txt
569	%%DOCSDIR%%/html/_sources/prop_test/WORKING_DIRECTORY.txt	580	%%DOCSDIR%%/html/_sources/prop_test/WORKING_DIRECTORY.txt
570	%%DOCSDIR%%/html/_sources/prop_tgt/ALIASED_TARGET.txt	581	%%DOCSDIR%%/html/_sources/prop_tgt/ALIASED_TARGET.txt
Lines 624-629 Link Here
624	%%DOCSDIR%%/html/_sources/prop_tgt/C_STANDARD_REQUIRED.txt	635	%%DOCSDIR%%/html/_sources/prop_tgt/C_STANDARD_REQUIRED.txt