svn commit: r396266 - in head: deskutils/owncloudclient devel/cmake devel/cmake-gui devel/cmake-modules devel/cmake/files math/cgal/files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Mon Sep 7 12:09:56 UTC 2015
Author: rakuco
Date: Mon Sep 7 12:09:53 2015
New Revision: 396266
URL: https://svnweb.freebsd.org/changeset/ports/396266
Log:
Update CMake to 3.1.1.
Release notes for the 3.3 series:
http://www.cmake.org/cmake/help/v3.3/release/3.3.html
This update took longer than expected because of a behavior change in CMake:
now calls to find_library(), find_path() etc will take the $PATH environment
variable into consideration, which in practice means that it will prefer
libraries in base instead of those in ports when both versions are available.
r395972 is an example of the groundwork that had to be done before landing this
patch.
- deskutils/owncloudclient: When OpenSSL from ports is to be used, make sure to
pass ${LOCALBASE} as $CMAKE_PREFIX_PATH, otherwise it will use the version in
base (see above) and fail on 9.x.
- math/cgal: Import upstream patch to fix the configuration process with CMake
3.3.x.
PR: 202516
Added:
head/math/cgal/files/patch-src_CMakeLists.txt (contents, props changed)
Deleted:
head/devel/cmake/files/patch-git_c775072a
Modified:
head/deskutils/owncloudclient/Makefile
head/devel/cmake-gui/Makefile
head/devel/cmake-modules/pkg-plist
head/devel/cmake/Makefile
head/devel/cmake/distinfo
head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
head/devel/cmake/pkg-plist
Modified: head/deskutils/owncloudclient/Makefile
==============================================================================
--- head/deskutils/owncloudclient/Makefile Mon Sep 7 12:04:23 2015 (r396265)
+++ head/deskutils/owncloudclient/Makefile Mon Sep 7 12:09:53 2015 (r396266)
@@ -39,6 +39,11 @@ PLIST_SUB= VERSION=${PORTVERSION}
.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015
WITH_OPENSSL_PORT= yes
+
+# CMake 3.3.x will use $PATH when looking for headers and libraries by default,
+# and OpenSSL from base will end up being used. Make sure ${LOCALBASE} is
+# preferred over $PATH.
+CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE}
.endif
post-patch:
Modified: head/devel/cmake-gui/Makefile
==============================================================================
--- head/devel/cmake-gui/Makefile Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake-gui/Makefile Mon Sep 7 12:09:53 2015 (r396266)
@@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= cmake
-PORTVERSION= 3.2.3
-PORTREVISION= 1
+PORTVERSION= 3.3.1
CATEGORIES= devel
-MASTER_SITES= http://www.cmake.org/files/v3.2/
+MASTER_SITES= http://www.cmake.org/files/v3.3/
PKGNAMESUFFIX= -gui
MAINTAINER= kde at FreeBSD.org
@@ -17,7 +16,7 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/
libexpat.so:${PORTSDIR}/textproc/expat2
USE_QT5= core gui widgets buildtools_build qmake_build
-USES= cmake:run desktop-file-utils shared-mime-info
+USES= cmake:run desktop-file-utils libarchive shared-mime-info
CMAKE_ARGS= -DBUILD_QtDialog:bool=on \
-DBUILD_CursesDialog:BOOL=OFF \
-DSPHINX_MAN:BOOL=ON \
@@ -30,14 +29,6 @@ INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialo
DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo
-.include <bsd.port.pre.mk>
-
-# CMake >= 3.1.0 needs libarchive3 because it calls
-# archive_entry_copy_sourcepath_w and archive_write_set_format_7zip.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
-LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
-.endif
-
post-patch:
@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
@@ -51,4 +42,4 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \
${STAGEDIR}${PREFIX}/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/cmake-modules/pkg-plist
==============================================================================
--- head/devel/cmake-modules/pkg-plist Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake-modules/pkg-plist Mon Sep 7 12:09:53 2015 (r396266)
@@ -142,6 +142,7 @@
%%DATADIR%%/Modules/CheckCXXSourceRuns.cmake
%%DATADIR%%/Modules/CheckCXXSymbolExists.cmake
%%DATADIR%%/Modules/CheckForPthreads.c
+%%DATADIR%%/Modules/CheckFortranCompilerFlag.cmake
%%DATADIR%%/Modules/CheckFortranFunctionExists.cmake
%%DATADIR%%/Modules/CheckFortranSourceCompiles.cmake
%%DATADIR%%/Modules/CheckFunctionExists.c
@@ -192,6 +193,9 @@
%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/GHS-C.cmake
+%%DATADIR%%/Modules/Compiler/GHS-CXX.cmake
+%%DATADIR%%/Modules/Compiler/GHS-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
%%DATADIR%%/Modules/Compiler/GNU-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/GNU-C.cmake
@@ -411,6 +415,7 @@
%%DATADIR%%/Modules/FindWget.cmake
%%DATADIR%%/Modules/FindWish.cmake
%%DATADIR%%/Modules/FindX11.cmake
+%%DATADIR%%/Modules/FindXCTest.cmake
%%DATADIR%%/Modules/FindXMLRPC.cmake
%%DATADIR%%/Modules/FindXercesC.cmake
%%DATADIR%%/Modules/FindZLIB.cmake
@@ -470,6 +475,7 @@
%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
%%DATADIR%%/Modules/MacOSXFrameworkInfo.plist.in
%%DATADIR%%/Modules/MacroAddFileDependencies.cmake
+%%DATADIR%%/Modules/MatlabTestsRedirect.cmake
%%DATADIR%%/Modules/NSIS.InstallOptions.ini.in
%%DATADIR%%/Modules/NSIS.template.in
%%DATADIR%%/Modules/Platform/AIX-GNU-ASM.cmake
@@ -505,6 +511,21 @@
%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
%%DATADIR%%/Modules/Platform/BlueGeneP-static.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-base.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-dynamic.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneQ-static-XL-CXX.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-GNU-C.cmake
%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
@@ -537,6 +558,8 @@
%%DATADIR%%/Modules/Platform/Darwin.cmake
%%DATADIR%%/Modules/Platform/DragonFly.cmake
%%DATADIR%%/Modules/Platform/FreeBSD.cmake
+%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
+%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
%%DATADIR%%/Modules/Platform/GNU.cmake
%%DATADIR%%/Modules/Platform/GNUtoMS_lib.bat.in
%%DATADIR%%/Modules/Platform/GNUtoMS_lib.cmake
@@ -554,6 +577,7 @@
%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
%%DATADIR%%/Modules/Platform/HP-UX.cmake
%%DATADIR%%/Modules/Platform/Haiku.cmake
Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake/Makefile Mon Sep 7 12:09:53 2015 (r396266)
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= cmake
-PORTVERSION= 3.2.3
-PORTREVISION?= 2
+PORTVERSION= 3.3.1
+PORTREVISION?= 0
CATEGORIES= devel
-MASTER_SITES= http://www.cmake.org/files/v3.2/
+MASTER_SITES= http://www.cmake.org/files/v3.3/
MAINTAINER= kde at FreeBSD.org
COMMENT?= Cross-platform Makefile generator
Modified: head/devel/cmake/distinfo
==============================================================================
--- head/devel/cmake/distinfo Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake/distinfo Mon Sep 7 12:09:53 2015 (r396266)
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.2.3.tar.gz) = a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
-SIZE (cmake-3.2.3.tar.gz) = 6438938
+SHA256 (cmake-3.3.1.tar.gz) = cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6
+SIZE (cmake-3.3.1.tar.gz) = 6577869
Modified: head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
==============================================================================
--- head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake Mon Sep 7 12:09:53 2015 (r396266)
@@ -1,11 +1,11 @@
---- Modules/FindwxWidgets.cmake.orig 2013-10-14 16:39:11.995705456 +0300
-+++ Modules/FindwxWidgets.cmake 2013-10-14 16:39:31.315704621 +0300
-@@ -702,7 +702,7 @@
- # UNIX: Start actual work.
+--- Modules/FindwxWidgets.cmake.orig 2015-07-23 15:59:33.000000000 +0200
++++ Modules/FindwxWidgets.cmake 2015-08-10 20:04:36.068295000 +0200
+@@ -741,7 +741,7 @@
#-----------------------------------------------------------------
# Support cross-compiling, only search in the target platform.
-- find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
-+ find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
+ find_program(wxWidgets_CONFIG_EXECUTABLE
+- NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
++ NAMES $ENV{WX_CONFIG} wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
DOC "Location of wxWidgets library configuration provider binary (wx-config)."
ONLY_CMAKE_FIND_ROOT_PATH
)
Modified: head/devel/cmake/pkg-plist
==============================================================================
--- head/devel/cmake/pkg-plist Mon Sep 7 12:04:23 2015 (r396265)
+++ head/devel/cmake/pkg-plist Mon Sep 7 12:09:53 2015 (r396266)
@@ -145,6 +145,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/generator/CodeBlocks.rst
%%DATADIR%%/Help/generator/CodeLite.rst
%%DATADIR%%/Help/generator/Eclipse CDT4.rst
+%%DATADIR%%/Help/generator/Green Hills MULTI.rst
%%DATADIR%%/Help/generator/KDevelop3.rst
%%DATADIR%%/Help/generator/Kate.rst
%%DATADIR%%/Help/generator/MSYS Makefiles.rst
@@ -166,7 +167,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/generator/Watcom WMake.rst
%%DATADIR%%/Help/generator/Xcode.rst
%%DATADIR%%/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
-%%DATADIR%%/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
+%%DATADIR%%/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
%%DATADIR%%/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
%%DATADIR%%/Help/index.rst
%%DATADIR%%/Help/manual/LINKS.txt
@@ -230,6 +231,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/module/CheckCXXSourceCompiles.rst
%%DATADIR%%/Help/module/CheckCXXSourceRuns.rst
%%DATADIR%%/Help/module/CheckCXXSymbolExists.rst
+%%DATADIR%%/Help/module/CheckFortranCompilerFlag.rst
%%DATADIR%%/Help/module/CheckFortranFunctionExists.rst
%%DATADIR%%/Help/module/CheckFortranSourceCompiles.rst
%%DATADIR%%/Help/module/CheckFunctionExists.rst
@@ -367,6 +369,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/module/FindWget.rst
%%DATADIR%%/Help/module/FindWish.rst
%%DATADIR%%/Help/module/FindX11.rst
+%%DATADIR%%/Help/module/FindXCTest.rst
%%DATADIR%%/Help/module/FindXMLRPC.rst
%%DATADIR%%/Help/module/FindXercesC.rst
%%DATADIR%%/Help/module/FindZLIB.rst
@@ -472,8 +475,16 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/policy/CMP0052.rst
%%DATADIR%%/Help/policy/CMP0053.rst
%%DATADIR%%/Help/policy/CMP0054.rst
-%%DATADIR%%/Help/policy/CMP0055.rst
+%%DATADIR%%/Help/policy/CMP0055.rst
%%DATADIR%%/Help/policy/CMP0056.rst
+%%DATADIR%%/Help/policy/CMP0057.rst
+%%DATADIR%%/Help/policy/CMP0058.rst
+%%DATADIR%%/Help/policy/CMP0059.rst
+%%DATADIR%%/Help/policy/CMP0060.rst
+%%DATADIR%%/Help/policy/CMP0061.rst
+%%DATADIR%%/Help/policy/CMP0062.rst
+%%DATADIR%%/Help/policy/CMP0063.rst
+%%DATADIR%%/Help/policy/DEPRECATED.txt
%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
%%DATADIR%%/Help/prop_cache/ADVANCED.rst
%%DATADIR%%/Help/prop_cache/HELPSTRING.rst
@@ -533,8 +544,11 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
%%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
%%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst
+%%DATADIR%%/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
%%DATADIR%%/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst
%%DATADIR%%/Help/prop_inst/CPACK_PERMANENT.rst
+%%DATADIR%%/Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
+%%DATADIR%%/Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
%%DATADIR%%/Help/prop_inst/CPACK_WIX_ACL.rst
%%DATADIR%%/Help/prop_sf/ABSTRACT.rst
%%DATADIR%%/Help/prop_sf/AUTORCC_OPTIONS.rst
@@ -560,6 +574,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_sf/VS_SHADER_FLAGS.rst
%%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst
%%DATADIR%%/Help/prop_sf/VS_SHADER_TYPE.rst
+%%DATADIR%%/Help/prop_sf/VS_XAML_TYPE.rst
%%DATADIR%%/Help/prop_sf/WRAP_EXCLUDE.rst
%%DATADIR%%/Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst
%%DATADIR%%/Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst
@@ -613,6 +628,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/CONFIG_OUTPUT_NAME.rst
%%DATADIR%%/Help/prop_tgt/CONFIG_POSTFIX.rst
+%%DATADIR%%/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
%%DATADIR%%/Help/prop_tgt/CXX_EXTENSIONS.rst
%%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst
%%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
@@ -675,6 +691,7 @@ share/aclocal/cmake.m4
%%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_INCLUDE_WHAT_YOU_USE.rst
%%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
%%DATADIR%%/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
%%DATADIR%%/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
@@ -732,7 +749,6 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/SUFFIX.rst
-%%DATADIR%%/Help/prop_tgt/TARGET_FILE_TYPES.txt
%%DATADIR%%/Help/prop_tgt/TYPE.rst
%%DATADIR%%/Help/prop_tgt/VERSION.rst
%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
@@ -752,23 +768,26 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/VS_WINRT_REFERENCES.rst
%%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
+%%DATADIR%%/Help/prop_tgt/XCTEST.rst
%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
%%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
-%%DATADIR%%/Help/release/3.0.rst
-%%DATADIR%%/Help/release/3.1.rst
+%%DATADIR%%/Help/release/3.0.rst
+%%DATADIR%%/Help/release/3.1.rst
%%DATADIR%%/Help/release/3.2.rst
+%%DATADIR%%/Help/release/3.3.rst
%%DATADIR%%/Help/release/dev.txt
%%DATADIR%%/Help/release/index.rst
%%DATADIR%%/Help/variable/APPLE.rst
%%DATADIR%%/Help/variable/BORLAND.rst
%%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
%%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
-%%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
%%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
%%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
%%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_AR.rst
%%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_ARGC.rst
%%DATADIR%%/Help/variable/CMAKE_ARGV0.rst
%%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
@@ -798,6 +817,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
%%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst
%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst
+%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
%%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst
%%DATADIR%%/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
%%DATADIR%%/Help/variable/CMAKE_CURRENT_LIST_DIR.rst
@@ -892,11 +912,16 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELWITHDEBINFO.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_IGNORE_EXTENSIONS.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_INCLUDE_DIRECTORIES.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst
@@ -911,6 +936,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst
%%DATADIR%%/Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst
@@ -923,8 +949,8 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_MACOSX_RPATH.rst
%%DATADIR%%/Help/variable/CMAKE_MAJOR_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_MAKE_PROGRAM.rst
-%%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
%%DATADIR%%/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
+%%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
%%DATADIR%%/Help/variable/CMAKE_MFC_FLAG.rst
%%DATADIR%%/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -953,6 +979,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
%%DATADIR%%/Help/variable/CMAKE_ROOT.rst
%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_SCRIPT_MODE_FILE.rst
%%DATADIR%%/Help/variable/CMAKE_SHARED_LIBRARY_PREFIX.rst
%%DATADIR%%/Help/variable/CMAKE_SHARED_LIBRARY_SUFFIX.rst
@@ -993,6 +1020,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_VISIBILITY_INLINES_HIDDEN.rst
%%DATADIR%%/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_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
@@ -1062,6 +1090,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CYGWIN.rst
%%DATADIR%%/Help/variable/ENV.rst
%%DATADIR%%/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
+%%DATADIR%%/Help/variable/GHS-MULTI.rst
%%DATADIR%%/Help/variable/LIBRARY_OUTPUT_PATH.rst
%%DATADIR%%/Help/variable/MINGW.rst
%%DATADIR%%/Help/variable/MSVC.rst
Added: head/math/cgal/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/cgal/files/patch-src_CMakeLists.txt Mon Sep 7 12:09:53 2015 (r396266)
@@ -0,0 +1,24 @@
+commit 61e61220eb43ea8c3d4a6ebd84d44b0510d8533d
+Author: Philipp Möller <bootsarehax at gmail.com>
+Date: Mon Jun 22 11:14:04 2015 +0200
+
+ Use get_filename_component to manipulate paths
+
+ This caused a bug in CMake>=3.3.0 when file(GLOB) is not adding multiple
+ slashes. The lack of trailing slashes is guaranteed and documented in
+ get_filename_component.
+
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -117,8 +117,9 @@ set(CGAL_CONFIGURED_LIBRARIES "")
+ foreach(package ${CGAL_CONFIGURED_PACKAGES})
+ file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
+ foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
+- string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
+- string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
++ get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile} DIRECTORY)
++ get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${CGAL_CONFIGURED_LIBRARY_NAME} NAME)
++
+ if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
+
+ message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
More information about the svn-ports-head
mailing list