pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/cmake



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Jul 21 06:52:55 UTC 2018

Modified Files:
        pkgsrc/devel/cmake: Makefile.version PLIST distinfo
        pkgsrc/devel/cmake/patches: patch-CMakeLists.txt
            patch-Source_Checks_cm_cxx_features.cmake
Removed Files:
        pkgsrc/devel/cmake/patches: patch-Source_Modules_FindLibUV.cmake

Log Message:
Update to 3.12.0

Changelog:
Changes made since CMake 3.11 include the following.

New Features

Generators

  * The Visual Studio Generators for VS 2017 learned to support a version=14.##
    option in the CMAKE_GENERATOR_TOOLSET value (e.g. via the cmake(1) -T
    option) to specify a toolset version number.

Command-Line

  * The cmake(1) Build Tool Mode (cmake --build) gained --parallel [<jobs>] and
    -j [<jobs>] options to specify a parallel build level. They map to
    corresponding options of the native build tool.

Commands

  * The add_compile_definitions() command was added to set preprocessor
    definitions at directory level. This supersedes add_definitions().
  * The cmake_minimum_required() and cmake_policy(VERSION) commands now accept
    a version range using the form <min>[...<max>]. The <min> version is
    required but policies are set based on the older of the running CMake
    version and the version specified by <max>. This allows projects to specify
    a range of versions for which they have been updated and avoid explicit
    policy settings.
  * The file(GLOB) and file(GLOB_RECURSE) commands learned a new flag
    CONFIGURE_DEPENDS which enables expression of build system dependency on
    globbed directory’s contents.
  * The file(TOUCH) and file(TOUCH_NOCREATE) commands were added to expose
    TOUCH functionality without having to use CMake’s command-line tool mode
    with execute_process().
  * The find_package() command now searches a prefix specified by a
    PackageName_ROOT CMake or environment variable. Package roots are
    maintained as a stack so nested calls to all find_* commands inside find
    modules also search the roots as prefixes. See policy CMP0074.
  * The install() command learned an optional NAMELINK_COMPONENT parameter,
    which allows you to change the component for a shared library’s namelink.
    If none is specified, the value of COMPONENT is used by default.
  * The list() command learned a JOIN sub-command to concatenate list’s
    elements separated by a glue string.
  * The list() command learned a SUBLIST sub-command to get a sublist of the
    list.
  * The list() command learned a TRANSFORM sub-command to apply various string
    transformation to list’s elements.
  * The project() command learned an optional HOMEPAGE_URL parameter which has
    the effect of setting variables like PROJECT_HOMEPAGE_URL, <PROJECT-NAME>
    _HOMEPAGE_URL and CMAKE_PROJECT_HOMEPAGE_URL.
  * The string() command learned a JOIN sub-command to concatenate input
    strings separated by a glue string.
  * target_compile_options() and add_compile_options() commands gained a SHELL:
    prefix to specify a group of related options using shell-like quoting.
  * The target_link_libraries() command now supports Object Libraries. Linking
    to an object library uses its object files in direct dependents and also
    propagates usage requirements.

Variables

  * The CMAKE_FOLDER variable was added to initialize the FOLDER property on
    all targets.
  * The CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable was defined to
    initialize all DOTNET_TARGET_FRAMEWORK_VERSION target properties.
  * CMAKE_PROJECT_VERSION* variables have been introduced:
      + CMAKE_PROJECT_VERSION
      + CMAKE_PROJECT_VERSION_MAJOR
      + CMAKE_PROJECT_VERSION_MINOR
      + CMAKE_PROJECT_VERSION_PATCH
      + CMAKE_PROJECT_VERSION_TWEAK
  * The CMAKE_SUPPRESS_REGENERATION variable was extended to support the Ninja
    and Makefile Generators. It is also now documented.
  * CMAKE_VS_SDK_*_DIRECTORIES variables were defined to tell Visual Studio
    Generators for VS 2010 and above how to populate fields in .vcxproj files
    that specify SDK directories. The variables are:
      + CMAKE_VS_SDK_EXCLUDE_DIRECTORIES
      + CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES
      + CMAKE_VS_SDK_INCLUDE_DIRECTORIES
      + CMAKE_VS_SDK_LIBRARY_DIRECTORIES
      + CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES
      + CMAKE_VS_SDK_REFERENCE_DIRECTORIES
      + CMAKE_VS_SDK_SOURCE_DIRECTORIES
  * A MSVC_TOOLSET_VERSION variable was added to provide the MSVC toolset
    version associated with the current MSVC compiler version in MSVC_VERSION.

Properties

  * The COMMON_LANGUAGE_RUNTIME target property was introduced to configure the
    use of managed C++ for Visual Studio Generators for VS 2010 and above. A
    corresponding IMPORTED_COMMON_LANGUAGE_RUNTIME target property was added to
    support C++/CLI for imported targets.
  * The DOTNET_TARGET_FRAMEWORK_VERSION target property was introduced as
    replacement for VS_DOTNET_TARGET_FRAMEWORK_VERSION, which is considered
    deprecated now.
  * An EXPORT_PROPERTIES target property was added to specify a custom list of
    target properties to include in targets exported by the install(EXPORT) and
    export() commands.
  * The PDB_OUTPUT_DIRECTORY property learned to support generator expressions.
  * A TESTS directory property was added to hold the list of tests defined by
    the add_test() command.
  * A VS_DEBUGGER_COMMAND target property was created to set the debugging
    command line with Visual Studio Generators for VS 2010 and above.
  * HLSL source file properties VS_SHADER_DISABLE_OPTIMIZATIONS and
    VS_SHADER_ENABLE_DEBUG gained support for generator expressions.
  * HLSL source file property VS_SHADER_OBJECT_FILE_NAME has been added to the
    Visual Studio Generators for VS 2010 and above. The property specifies the
    file name of the compiled shader object.

Modules

  * The FindALSA module now provides imported targets.
  * The FindCURL module now provides imported targets.
  * The FindJPEG module now provides imported targets.
  * The FindLibXml2 module now provides imported targets.
  * The FindMatlab module now supports the Matlab Runtime Compiler (MCR) for
    compiling and linking matlab extensions.
  * A FindODBC module was added to find an Open Database Connectivity (ODBC)
    library.
  * The FindPkgConfig module has learned to export the found libraries with
    full path for direct consumption with the target_link_libraries() command.
  * New FindPython3 and FindPython2 modules, as well as a new FindPython
    module, have been added to provide a new way to locate python environments.
  * The UseSWIG module gained a whole refresh and is now more consistent with
    standard CMake commands to generate libraries and is fully configurable
    through properties.
  * The UseSWIG module learned to manage multiple behaviors through
    UseSWIG_MODULE_VERSION variable to ensure legacy support as well as more
    robust handling of SWIG advanced features (like %template).
  * The UseSWIG module learned to support CSHARP variant wrapper files.
  * The WriteCompilerDetectionHeader module gained a BARE_FEATURES option to
    add a compatibility define for the exact keyword of a new language feature.

Generator Expressions

  * A new $<GENEX_EVAL:...> and $<TARGET_GENEX_EVAL:target,...> generator
    expression has been added to enable consumption of generator expressions
    whose evaluation results itself in generator expressions.
  * A new $<IN_LIST:...> generator expression has been added.
  * A new $<TARGET_EXISTS:...> generator expression has been added.
  * A new $<TARGET_NAME_IF_EXISTS:...> generator expression has been added.

CTest

  * The ctest_start() command has been reworked so that you can simply call
    ctest_start(APPEND) and it will read all the needed information from the
    TAG file. The argument parsing has also been relaxed so that the order of
    the arguments is less significant.
  * A PROCESSOR_AFFINITY test property was added to request that CTest run a
    test with CPU affinity for a set of processors disjoint from other
    concurrently running tests with the property set.

CPack

  * The CPack module now uses variables CMAKE_PROJECT_VERSION_MAJOR,
    CMAKE_PROJECT_VERSION_MINOR and CMAKE_PROJECT_VERSION_PATCH to initialize
    corresponding CPack variables.
  * cpack(1) gained basic support for NuGet. See the CPackNuGet module.

Other

  * The Compile Features functionality is now aware of C++ 20. No specific
    features are yet enumerated besides the cxx_std_20 meta-feature.
  * The Compile Features functionality is now aware of the availability of C
    features in MSVC since VS 2010.
  * The Compile Features functionality is now aware of C language standards
    supported by Texas Instruments C compilers.

Deprecated and Removed Features

  * The Visual Studio 8 2005 generator has been removed.
  * CMake no longer produces <tgt>_LIB_DEPENDS cache entries for library
    targets. See policy CMP0073.

Other Changes

  * Include flags for directories marked as SYSTEM are now moved after
    non-system directories. The -isystem flag does this automatically, so
    moving them explicitly to the end makes the behavior consistent on
    compilers that do not have any -isystem flag.
  * Fortran dependency scanning now supports dependencies implied by Fortran
    Submodules.
  * The existence and functionality of the file ${CMAKE_BINARY_DIR}/
    cmake_install.cmake has now been documented in the install() documentation
    so that external packaging software can take advantage of CPack-style
    component installs.
  * The CheckIncludeFile module check_include_file macro learned to honor the
    CMAKE_REQUIRED_LIBRARIES variable. See policy CMP0075.
  * The CheckIncludeFileCXX module check_include_file_cxx macro learned to
    honor the CMAKE_REQUIRED_LIBRARIES variable. See policy CMP0075.
  * The CheckIncludeFiles module check_include_files macro learned to honor the
    CMAKE_REQUIRED_LIBRARIES variable. See policy CMP0075.
  * The cmake(1) -E copy_directory tool now fails when the source directory
    does not exist. Previously it succeeded by creating an empty destination
    directory.
  * The UseSWIG module swig_add_library() command (and legacy swig_add_module
    command) now set the prefix of Java modules to "" for MINGW, MSYS, and
    CYGWIN environments.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_Modules_FindLibUV.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile.version
diff -u pkgsrc/devel/cmake/Makefile.version:1.27 pkgsrc/devel/cmake/Makefile.version:1.28
--- pkgsrc/devel/cmake/Makefile.version:1.27    Sun Jun 24 09:13:22 2018
+++ pkgsrc/devel/cmake/Makefile.version Sat Jul 21 06:52:55 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.27 2018/06/24 09:13:22 adam Exp $
+# $NetBSD: Makefile.version,v 1.28 2018/07/21 06:52:55 ryoon Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION= 3.11.4
+CMAKE_VERSION= 3.12.0
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.49 pkgsrc/devel/cmake/PLIST:1.50
--- pkgsrc/devel/cmake/PLIST:1.49       Mon Apr  2 19:36:44 2018
+++ pkgsrc/devel/cmake/PLIST    Sat Jul 21 06:52:55 2018
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.49 2018/04/02 19:36:44 adam Exp $
-bin/ccmake
+@comment $NetBSD: PLIST,v 1.50 2018/07/21 06:52:55 ryoon Exp $
 bin/cmake
 bin/cpack
 bin/ctest
 share/aclocal/cmake.m4
+share/cmake-${CMAKE_API}/Help/command/COMPILE_OPTIONS_SHELL.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ORDER.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ROOT.txt
+share/cmake-${CMAKE_API}/Help/command/add_compile_definitions.rst
 share/cmake-${CMAKE_API}/Help/command/add_compile_options.rst
 share/cmake-${CMAKE_API}/Help/command/add_custom_command.rst
 share/cmake-${CMAKE_API}/Help/command/add_custom_target.rst
@@ -129,6 +130,7 @@ share/cmake-${CMAKE_API}/Help/envvar/ASM
 share/cmake-${CMAKE_API}/Help/envvar/ASM_DIALECTFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CC.rst
 share/cmake-${CMAKE_API}/Help/envvar/CFLAGS.rst
+share/cmake-${CMAKE_API}/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_CONFIG_TYPE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
@@ -143,6 +145,7 @@ share/cmake-${CMAKE_API}/Help/envvar/CUD
 share/cmake-${CMAKE_API}/Help/envvar/CXX.rst
 share/cmake-${CMAKE_API}/Help/envvar/CXXFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/DASHBOARD_TEST_FROM_CTEST.rst
+share/cmake-${CMAKE_API}/Help/envvar/DESTDIR.rst
 share/cmake-${CMAKE_API}/Help/envvar/FC.rst
 share/cmake-${CMAKE_API}/Help/envvar/FFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/LDFLAGS.rst
@@ -233,6 +236,7 @@ share/cmake-${CMAKE_API}/Help/module/CPa
 share/cmake-${CMAKE_API}/Help/module/CPackIFW.rst
 share/cmake-${CMAKE_API}/Help/module/CPackIFWConfigureFile.rst
 share/cmake-${CMAKE_API}/Help/module/CPackNSIS.rst
+share/cmake-${CMAKE_API}/Help/module/CPackNuGet.rst
 share/cmake-${CMAKE_API}/Help/module/CPackPackageMaker.rst
 share/cmake-${CMAKE_API}/Help/module/CPackProductBuild.rst
 share/cmake-${CMAKE_API}/Help/module/CPackRPM.rst
@@ -345,6 +349,7 @@ share/cmake-${CMAKE_API}/Help/module/Fin
 share/cmake-${CMAKE_API}/Help/module/FindMPI.rst
 share/cmake-${CMAKE_API}/Help/module/FindMatlab.rst
 share/cmake-${CMAKE_API}/Help/module/FindMotif.rst
+share/cmake-${CMAKE_API}/Help/module/FindODBC.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenACC.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenAL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenCL.rst
@@ -366,6 +371,9 @@ share/cmake-${CMAKE_API}/Help/module/Fin
 share/cmake-${CMAKE_API}/Help/module/FindPostgreSQL.rst
 share/cmake-${CMAKE_API}/Help/module/FindProducer.rst
 share/cmake-${CMAKE_API}/Help/module/FindProtobuf.rst
+share/cmake-${CMAKE_API}/Help/module/FindPython.rst
+share/cmake-${CMAKE_API}/Help/module/FindPython2.rst
+share/cmake-${CMAKE_API}/Help/module/FindPython3.rst
 share/cmake-${CMAKE_API}/Help/module/FindPythonInterp.rst
 share/cmake-${CMAKE_API}/Help/module/FindPythonLibs.rst
 share/cmake-${CMAKE_API}/Help/module/FindQt.rst
@@ -521,6 +529,9 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0070.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0071.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0072.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0073.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0074.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0075.rst
 share/cmake-${CMAKE_API}/Help/policy/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -555,6 +566,7 @@ share/cmake-${CMAKE_API}/Help/prop_dir/R
 share/cmake-${CMAKE_API}/Help/prop_dir/RULE_LAUNCH_LINK.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/SUBDIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/TESTS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TEST_INCLUDE_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TEST_INCLUDE_FILES.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/VARIABLES.rst
@@ -571,6 +583,7 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/C
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/DISABLED_FEATURES.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ENABLED_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ENABLED_LANGUAGES.rst
@@ -637,6 +650,7 @@ share/cmake-${CMAKE_API}/Help/prop_sf/VS
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_MODEL.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_OUTPUT_HEADER_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_VARIABLE_NAME.rst
@@ -660,6 +674,7 @@ share/cmake-${CMAKE_API}/Help/prop_test/
 share/cmake-${CMAKE_API}/Help/prop_test/MEASUREMENT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/PASS_REGULAR_EXPRESSION.rst
 share/cmake-${CMAKE_API}/Help/prop_test/PROCESSORS.rst
+share/cmake-${CMAKE_API}/Help/prop_test/PROCESSOR_AFFINITY.rst
 share/cmake-${CMAKE_API}/Help/prop_test/REQUIRED_FILES.rst
 share/cmake-${CMAKE_API}/Help/prop_test/RESOURCE_LOCK.rst
 share/cmake-${CMAKE_API}/Help/prop_test/RUN_SERIAL.rst
@@ -709,6 +724,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/B
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE_EXTENSION.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
@@ -741,11 +757,13 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/C
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEBUG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEFINE_SYMBOL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ENABLE_EXPORTS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_PROPERTIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EchoString.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FOLDER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FRAMEWORK.rst
@@ -757,6 +775,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/G
 share/cmake-${CMAKE_API}/Help/prop_tgt/HAS_CXX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_GLOBAL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_IMPLIB.rst
@@ -870,6 +889,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/T
 share/cmake-${CMAKE_API}/Help/prop_tgt/VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
@@ -903,10 +923,11 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/X
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCTEST.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_NAME.txt
-share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
 share/cmake-${CMAKE_API}/Help/release/3.0.rst
 share/cmake-${CMAKE_API}/Help/release/3.1.rst
 share/cmake-${CMAKE_API}/Help/release/3.10.rst
+share/cmake-${CMAKE_API}/Help/release/3.11.rst
+share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
 share/cmake-${CMAKE_API}/Help/release/3.2.rst
 share/cmake-${CMAKE_API}/Help/release/3.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
@@ -1019,6 +1040,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DIRECTORY_LABELS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DL_LIBS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
@@ -1054,6 +1076,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst
@@ -1211,8 +1234,14 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PREFIX_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROGRAM_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_DESCRIPTION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_HOMEPAGE_URL.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_VERSION_MAJOR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_VERSION_MINOR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_VERSION_PATCH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_VERSION_TWEAK.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_RANLIB.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ROOT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
@@ -1242,6 +1271,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SUPPRESS_REGENERATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT_LINK.rst
@@ -1278,6 +1308,14 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_INCLUDE_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_LIBRARY_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
@@ -1384,8 +1422,11 @@ share/cmake-${CMAKE_API}/Help/variable/M
 share/cmake-${CMAKE_API}/Help/variable/MSVC80.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC90.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC_IDE.rst
+share/cmake-${CMAKE_API}/Help/variable/MSVC_TOOLSET_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_BINARY_DIR.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_DESCRIPTION.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
@@ -1394,6 +1435,7 @@ share/cmake-${CMAKE_API}/Help/variable/P
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_DESCRIPTION.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT_HOMEPAGE_URL.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_VERSION.rst
@@ -1535,6 +1577,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeVe
 share/cmake-${CMAKE_API}/Modules/CPack.DS_Store.in
 share/cmake-${CMAKE_API}/Modules/CPack.Description.plist.in
 share/cmake-${CMAKE_API}/Modules/CPack.Info.plist.in
+share/cmake-${CMAKE_API}/Modules/CPack.NuGet.nuspec.in
 share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.in
 share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.rsrc.in
 share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.Info.plist.in
@@ -1555,6 +1598,7 @@ share/cmake-${CMAKE_API}/Modules/CPackFr
 share/cmake-${CMAKE_API}/Modules/CPackIFW.cmake
 share/cmake-${CMAKE_API}/Modules/CPackIFWConfigureFile.cmake
 share/cmake-${CMAKE_API}/Modules/CPackNSIS.cmake
+share/cmake-${CMAKE_API}/Modules/CPackNuGet.cmake
 share/cmake-${CMAKE_API}/Modules/CPackPackageMaker.cmake
 share/cmake-${CMAKE_API}/Modules/CPackProductBuild.cmake
 share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake
@@ -1705,6 +1749,8 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C-FeatureTests.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-DetermineCompiler.cmake
@@ -1865,6 +1911,7 @@ share/cmake-${CMAKE_API}/Modules/FindMPI
 share/cmake-${CMAKE_API}/Modules/FindMPI/test_mpi.f90.in
 share/cmake-${CMAKE_API}/Modules/FindMatlab.cmake
 share/cmake-${CMAKE_API}/Modules/FindMotif.cmake
+share/cmake-${CMAKE_API}/Modules/FindODBC.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenACC.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenAL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenCL.cmake
@@ -1886,6 +1933,10 @@ share/cmake-${CMAKE_API}/Modules/FindPkg
 share/cmake-${CMAKE_API}/Modules/FindPostgreSQL.cmake
 share/cmake-${CMAKE_API}/Modules/FindProducer.cmake
 share/cmake-${CMAKE_API}/Modules/FindProtobuf.cmake
+share/cmake-${CMAKE_API}/Modules/FindPython.cmake
+share/cmake-${CMAKE_API}/Modules/FindPython/Support.cmake
+share/cmake-${CMAKE_API}/Modules/FindPython2.cmake
+share/cmake-${CMAKE_API}/Modules/FindPython3.cmake
 share/cmake-${CMAKE_API}/Modules/FindPythonInterp.cmake
 share/cmake-${CMAKE_API}/Modules/FindPythonLibs.cmake
 share/cmake-${CMAKE_API}/Modules/FindQt.cmake
@@ -2049,6 +2100,30 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport_static.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-system.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-NAG-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-NVIDIA-CUDA.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-PGI-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-PGI-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-PGI-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-PGI.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-VisualAge-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-VisualAge-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-XL-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BSDOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BeOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneL.cmake
@@ -2093,32 +2168,8 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CrayLinuxEnvironment.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Absoft-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Determine-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Initialize.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NAG-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NVIDIA-CUDA.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-Fortran.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-CXX.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/DragonFly.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Euros.cmake

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.123 pkgsrc/devel/cmake/distinfo:1.124
--- pkgsrc/devel/cmake/distinfo:1.123   Sun Jun 24 09:13:22 2018
+++ pkgsrc/devel/cmake/distinfo Sat Jul 21 06:52:55 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.123 2018/06/24 09:13:22 adam Exp $
+$NetBSD: distinfo,v 1.124 2018/07/21 06:52:55 ryoon Exp $
 
-SHA1 (cmake-3.11.4.tar.gz) = 6bcf931844964fefc4ccfd7d025ba4ec2c7c2abb
-RMD160 (cmake-3.11.4.tar.gz) = 6182b0a029c127db27bd88208bbb7f94923ecb2d
-SHA512 (cmake-3.11.4.tar.gz) = c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-Size (cmake-3.11.4.tar.gz) = 7955301 bytes
-SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
+SHA1 (cmake-3.12.0.tar.gz) = e140830af031c570b69e141f469bbab1e6cf3d0d
+RMD160 (cmake-3.12.0.tar.gz) = e4165d2e2ff4ce76e9d5c023a9731f826da5be40
+SHA512 (cmake-3.12.0.tar.gz) = e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
+Size (cmake-3.12.0.tar.gz) = 8089372 bytes
+SHA1 (patch-CMakeLists.txt) = 933e640b89293754dc732167fc078a5656e02ec7
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
@@ -13,8 +13,7 @@ SHA1 (patch-Modules_FindX11.cmake) = 124
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
 SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = 37772f3e7edc2413cb2e294462312aff18e5c989
-SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 83eb2bedb84972637d02d12f72fec0ccf74563eb
+SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 3d6e3ac6ad25890d223601c15fb208b8e77ff77c
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
-SHA1 (patch-Source_Modules_FindLibUV.cmake) = 54773f03e8122904985c192c14d56c01f8f98e6c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = 9d99cfe9f9ae826250f94bc297f5a22b8de09e84

Index: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.5 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.5 Thu Jul 28 17:44:43 2016
+++ pkgsrc/devel/cmake/patches/patch-CMakeLists.txt     Sat Jul 21 06:52:55 2018
@@ -1,14 +1,14 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2016/07/28 17:44:43 prlw1 Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2018/07/21 06:52:55 ryoon Exp $
 
 Don't insist on ncurses.
 
---- CMakeLists.txt.orig        2015-09-14 13:22:28.000000000 +0000
+--- CMakeLists.txt.orig        2018-07-17 11:28:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -423,7 +423,6 @@ macro (CMAKE_BUILD_UTILITIES)
-   if (UNIX)
-     # there is a bug in the Syllable libraries which makes linking ccmake fail, Alex
-     if(NOT CMAKE_SYSTEM_NAME MATCHES syllable)
--      set(CURSES_NEED_NCURSES TRUE)
-       find_package(Curses QUIET)
-       if (CURSES_LIBRARY)
-         option(BUILD_CursesDialog "Build the CMake Curses Dialog ccmake" ON)
+@@ -581,7 +581,6 @@ macro (CMAKE_BUILD_UTILITIES)
+     set(BUILD_CursesDialog 0)
+   endif ()
+   if(BUILD_CursesDialog)
+-    set(CURSES_NEED_NCURSES TRUE)
+     find_package(Curses)
+     if(NOT CURSES_FOUND)
+       message(WARNING

Index: pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake:1.1 pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake:1.2
--- pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake:1.1    Mon Jun 11 17:33:51 2018
+++ pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake        Sat Jul 21 06:52:55 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_Checks_cm_cxx_features.cmake,v 1.1 2018/06/11 17:33:51 tron Exp $
+$NetBSD: patch-Source_Checks_cm_cxx_features.cmake,v 1.2 2018/07/21 06:52:55 ryoon Exp $
 
 Ignore warnings like ...
 
@@ -6,13 +6,13 @@ Ignore warnings like ...
 
 ... caused by recent version of Xcode which break C++11 detection under macOS.
 
---- Source/Checks/cm_cxx_features.cmake.orig   2018-05-31 13:39:10.000000000 +0100
-+++ Source/Checks/cm_cxx_features.cmake        2018-06-11 18:24:30.000000000 +0100
-@@ -21,6 +21,7 @@
+--- Source/Checks/cm_cxx_features.cmake.orig   2018-07-17 11:29:00.000000000 +0000
++++ Source/Checks/cm_cxx_features.cmake
+@@ -21,6 +21,7 @@ function(cm_check_cxx_feature name)
      string(REGEX REPLACE "[^\n]*warning:[^\n]*-Winvalid-command-line-argument[^\n]*" "" check_output "${check_output}")
      # Filter out warnings caused by local configuration.
      string(REGEX REPLACE "[^\n]*warning:[^\n]*directory not found for option[^\n]*" "" check_output "${check_output}")
 +    string(REGEX REPLACE "[^\n]*warning:[^\n]*text-based stub file [^\n]* and library file [^\n]* are out of sync[^\n]*" "" check_output "${check_output}")
      string(REGEX REPLACE "[^\n]*warning:[^\n]*object file compiled with -mlong-branch which is no longer needed[^\n]*" "" check_output "${check_output}")
-     # If using the feature causes warnings, treat it as broken/unavailable.
-     if(check_output MATCHES "[Ww]arning")
+     # Filter out xcodebuild warnings.
+     string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\] warning: [^\n]*" "" check_output "${check_output}")



Home | Main Index | Thread Index | Old Index