svn commit: r508922 - in head: databases/opendbviewer devel/cmake devel/cmake-doc devel/cmake-gui devel/cmake/files devel/kms-cmake-utils graphics/peruse/files misc/libemos misc/libemos/files
Adriaan de Groot
adridg at FreeBSD.org
Wed Aug 14 14:18:40 UTC 2019
Author: adridg
Date: Wed Aug 14 14:18:36 2019
New Revision: 508922
URL: https://svnweb.freebsd.org/changeset/ports/508922
Log:
Update devel/cmake to 3.15.2 (latest upstream release)
Release notes for the version updates are at:
https://blog.kitware.com/cmake-3-15-0-available-for-download/
https://blog.kitware.com/cmake-3-15-1-available-for-download/
https://blog.kitware.com/cmake-3-15-2-available-for-download/
For FreeBSD, not much interesting has changed. Swift language support
might be useful.
A few ports were fixed as part of this exp-run (libemos not really
related to the CMake update, but in general). Thanks to antoine
for the exp-runs, tcberner for doing most of the prep-work.
PR: 239273
Submitted by: tcberner
Added:
head/graphics/peruse/files/
head/graphics/peruse/files/patch-src_qtquick_karchive_rar_CMakeLists.txt (contents, props changed)
head/misc/libemos/files/patch-libemos-dp_CMakeLists.txt (contents, props changed)
head/misc/libemos/files/patch-libemos-sp_CMakeLists.txt (contents, props changed)
Modified:
head/databases/opendbviewer/Makefile
head/devel/cmake-doc/Makefile
head/devel/cmake-gui/Makefile
head/devel/cmake/Makefile
head/devel/cmake/distinfo
head/devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx
head/devel/cmake/pkg-plist
head/devel/kms-cmake-utils/pkg-plist
head/misc/libemos/pkg-plist
Modified: head/databases/opendbviewer/Makefile
==============================================================================
--- head/databases/opendbviewer/Makefile Wed Aug 14 13:50:28 2019 (r508921)
+++ head/databases/opendbviewer/Makefile Wed Aug 14 14:18:36 2019 (r508922)
@@ -25,4 +25,6 @@ OPTIONS_DEFAULT= PGSQL
PGSQL_USE= QT=sql-pgsql
MYSQL_USE= QT=sql-mysql
+CMAKE_ARGS+= -DCMAKE_CXX_STANDARD=11
+
.include <bsd.port.mk>
Modified: head/devel/cmake-doc/Makefile
==============================================================================
--- head/devel/cmake-doc/Makefile Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake-doc/Makefile Wed Aug 14 14:18:36 2019 (r508922)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmake
-DISTVERSION= 3.14.5
+DISTVERSION= 3.15.2
CATEGORIES= devel
MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
PKGNAMESUFFIX= -doc
Modified: head/devel/cmake-gui/Makefile
==============================================================================
--- head/devel/cmake-gui/Makefile Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake-gui/Makefile Wed Aug 14 14:18:36 2019 (r508922)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmake
-DISTVERSION= 3.14.5
-PORTREVISION= 1
+DISTVERSION= 3.15.2
CATEGORIES= devel
MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
PKGNAMESUFFIX= -gui
Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake/Makefile Wed Aug 14 14:18:36 2019 (r508922)
@@ -3,10 +3,10 @@
PORTNAME= cmake
# Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION= 3.14.5
-PORTREVISION= 1
+DISTVERSION= 3.15.2
CATEGORIES= devel
-MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
+MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
+ https://www.cmake.org/files/v${PORTVERSION}/
MAINTAINER= kde at FreeBSD.org
COMMENT= Cross-platform Makefile generator
Modified: head/devel/cmake/distinfo
==============================================================================
--- head/devel/cmake/distinfo Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake/distinfo Wed Aug 14 14:18:36 2019 (r508922)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559327154
-SHA256 (cmake-3.14.5.tar.gz) = 505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06
-SIZE (cmake-3.14.5.tar.gz) = 8854929
+TIMESTAMP = 1565240207
+SHA256 (cmake-3.15.2.tar.gz) = 539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
+SIZE (cmake-3.15.2.tar.gz) = 9269449
Modified: head/devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx
==============================================================================
--- head/devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx Wed Aug 14 14:18:36 2019 (r508922)
@@ -1,11 +1,9 @@
-diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx
-index 91ae1a23f..a676302e7 100644
---- Source/CPack/cmCPackFreeBSDGenerator.cxx
+--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig 2019-06-04 16:37:41 UTC
+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
-@@ -339,6 +339,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()
+@@ -331,6 +331,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()
- std::string output_dir =
- cmSystemTools::CollapseCombinedPath(toplevel, "../");
+ std::string broken_suffix = std::string("-") +
+ var_lookup("CPACK_TOPLEVEL_TAG") + std::string(GetOutputExtension());
+ if (!pkg_initialized() && pkg_init(NULL, NULL) != EPKG_OK)
+ {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -13,6 +11,6 @@ index 91ae1a23f..a676302e7 100644
+ return 0;
+ }
+
- pkg_create_from_manifest(output_dir.c_str(), ::TXZ, toplevel.c_str(),
- manifestname.c_str(), NULL);
-
+ for (std::string& name : packageFileNames) {
+ cmCPackLogger(cmCPackLog::LOG_DEBUG, "Packagefile " << name << std::endl);
+ if (has_suffix(name, broken_suffix)) {
Modified: head/devel/cmake/pkg-plist
==============================================================================
--- head/devel/cmake/pkg-plist Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/cmake/pkg-plist Wed Aug 14 14:18:36 2019 (r508922)
@@ -172,6 +172,10 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/envvar/CFLAGS.rst
%%DATADIR%%/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
%%DATADIR%%/Help/envvar/CMAKE_CONFIG_TYPE.rst
+%%DATADIR%%/Help/envvar/CMAKE_GENERATOR.rst
+%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_INSTANCE.rst
+%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_PLATFORM.rst
+%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_TOOLSET.rst
%%DATADIR%%/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
%%DATADIR%%/Help/envvar/CMAKE_NO_VERBOSE.rst
%%DATADIR%%/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
@@ -196,6 +200,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/envvar/PackageName_ROOT.rst
%%DATADIR%%/Help/envvar/RC.rst
%%DATADIR%%/Help/envvar/RCFLAGS.rst
+%%DATADIR%%/Help/envvar/SWIFTC.rst
%%DATADIR%%/Help/envvar/VERBOSE.rst
%%DATADIR%%/Help/generator/Borland Makefiles.rst
%%DATADIR%%/Help/generator/CodeBlocks.rst
@@ -348,6 +353,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/module/FindDevIL.rst
%%DATADIR%%/Help/module/FindDoxygen.rst
%%DATADIR%%/Help/module/FindEXPAT.rst
+%%DATADIR%%/Help/module/FindEnvModules.rst
%%DATADIR%%/Help/module/FindFLEX.rst
%%DATADIR%%/Help/module/FindFLTK.rst
%%DATADIR%%/Help/module/FindFLTK2.rst
@@ -597,6 +603,12 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/policy/CMP0086.rst
%%DATADIR%%/Help/policy/CMP0087.rst
%%DATADIR%%/Help/policy/CMP0088.rst
+%%DATADIR%%/Help/policy/CMP0089.rst
+%%DATADIR%%/Help/policy/CMP0090.rst
+%%DATADIR%%/Help/policy/CMP0091.rst
+%%DATADIR%%/Help/policy/CMP0092.rst
+%%DATADIR%%/Help/policy/CMP0093.rst
+%%DATADIR%%/Help/policy/CMP0094.rst
%%DATADIR%%/Help/policy/DEPRECATED.txt
%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
%%DATADIR%%/Help/prop_cache/ADVANCED.rst
@@ -605,6 +617,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_cache/STRINGS.rst
%%DATADIR%%/Help/prop_cache/TYPE.rst
%%DATADIR%%/Help/prop_cache/VALUE.rst
+%%DATADIR%%/Help/prop_dir/ADDITIONAL_CLEAN_FILES.rst
%%DATADIR%%/Help/prop_dir/ADDITIONAL_MAKE_CLEAN_FILES.rst
%%DATADIR%%/Help/prop_dir/BINARY_DIR.rst
%%DATADIR%%/Help/prop_dir/BUILDSYSTEM_TARGETS.rst
@@ -616,7 +629,6 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_dir/COMPILE_OPTIONS.rst
%%DATADIR%%/Help/prop_dir/DEFINITIONS.rst
%%DATADIR%%/Help/prop_dir/EXCLUDE_FROM_ALL.rst
-%%DATADIR%%/Help/prop_tgt/GHS_NO_SOURCE_GROUP_FILE.rst
%%DATADIR%%/Help/prop_dir/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
%%DATADIR%%/Help/prop_dir/INCLUDE_DIRECTORIES.rst
%%DATADIR%%/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
@@ -707,6 +719,8 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_sf/SKIP_AUTORCC.rst
%%DATADIR%%/Help/prop_sf/SKIP_AUTOUIC.rst
%%DATADIR%%/Help/prop_sf/SYMBOLIC.rst
+%%DATADIR%%/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst
+%%DATADIR%%/Help/prop_sf/Swift_DIAGNOSTICS_FILE.rst
%%DATADIR%%/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
%%DATADIR%%/Help/prop_sf/VS_CSHARP_tagname.rst
%%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
@@ -751,6 +765,7 @@ share/aclocal/cmake.m4
%%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/ADDITIONAL_CLEAN_FILES.rst
%%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
%%DATADIR%%/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
%%DATADIR%%/Help/prop_tgt/ANDROID_API.rst
@@ -846,6 +861,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/Fortran_MODULE_DIRECTORY.rst
%%DATADIR%%/Help/prop_tgt/GENERATOR_FILE_NAME.rst
%%DATADIR%%/Help/prop_tgt/GHS_INTEGRITY_APP.rst
+%%DATADIR%%/Help/prop_tgt/GHS_NO_SOURCE_GROUP_FILE.rst
%%DATADIR%%/Help/prop_tgt/GNUtoMS.rst
%%DATADIR%%/Help/prop_tgt/HAS_CXX.rst
%%DATADIR%%/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
@@ -932,6 +948,8 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/MACOSX_RPATH.rst
%%DATADIR%%/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
%%DATADIR%%/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt
+%%DATADIR%%/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst
%%DATADIR%%/Help/prop_tgt/NAME.rst
%%DATADIR%%/Help/prop_tgt/NO_SONAME.rst
%%DATADIR%%/Help/prop_tgt/NO_SYSTEM_FROM_IMPORTED.rst
@@ -967,6 +985,9 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
%%DATADIR%%/Help/prop_tgt/SUFFIX.rst
+%%DATADIR%%/Help/prop_tgt/Swift_DEPENDENCIES_FILE.rst
+%%DATADIR%%/Help/prop_tgt/Swift_MODULE_DIRECTORY.rst
+%%DATADIR%%/Help/prop_tgt/Swift_MODULE_NAME.rst
%%DATADIR%%/Help/prop_tgt/TYPE.rst
%%DATADIR%%/Help/prop_tgt/VERSION.rst
%%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
@@ -987,8 +1008,12 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/VS_GLOBAL_variable.rst
%%DATADIR%%/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
%%DATADIR%%/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
+%%DATADIR%%/Help/prop_tgt/VS_JUST_MY_CODE_DEBUGGING.rst
%%DATADIR%%/Help/prop_tgt/VS_KEYWORD.rst
%%DATADIR%%/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
+%%DATADIR%%/Help/prop_tgt/VS_NO_SOLUTION_DEPLOY.rst
+%%DATADIR%%/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst
+%%DATADIR%%/Help/prop_tgt/VS_PROJECT_IMPORT.rst
%%DATADIR%%/Help/prop_tgt/VS_SCC_AUXPATH.rst
%%DATADIR%%/Help/prop_tgt/VS_SCC_LOCALPATH.rst
%%DATADIR%%/Help/prop_tgt/VS_SCC_PROJECTNAME.rst
@@ -1003,10 +1028,12 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
%%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
%%DATADIR%%/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_GENERATE_SCHEME.rst
%%DATADIR%%/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_ARGUMENTS.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DEBUG_AS_ROOT.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
%%DATADIR%%/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
@@ -1032,11 +1059,12 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/release/3.12.rst
%%DATADIR%%/Help/release/3.13.rst
%%DATADIR%%/Help/release/3.14.rst
+%%DATADIR%%/Help/release/3.15.rst
%%DATADIR%%/Help/release/3.2.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/%%PYTHON_VER%%.rst
%%DATADIR%%/Help/release/3.7.rst
%%DATADIR%%/Help/release/3.8.rst
%%DATADIR%%/Help/release/3.9.rst
@@ -1159,12 +1187,14 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst
%%DATADIR%%/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
+%%DATADIR%%/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG_INIT.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_INIT.rst
%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
+%%DATADIR%%/Help/variable/CMAKE_EXPORT_PACKAGE_REGISTRY.rst
%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_APPBUNDLE.rst
@@ -1176,6 +1206,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_NAME.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.rst
+%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_PREFER_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_SORT_DIRECTION.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_PACKAGE_SORT_ORDER.rst
@@ -1187,6 +1218,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst
%%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
%%DATADIR%%/Help/variable/CMAKE_FOLDER.rst
+%%DATADIR%%/Help/variable/CMAKE_FRAMEWORK.rst
%%DATADIR%%/Help/variable/CMAKE_FRAMEWORK_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_Fortran_FORMAT.rst
%%DATADIR%%/Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst
@@ -1327,6 +1359,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
%%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
+%%DATADIR%%/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst
%%DATADIR%%/Help/variable/CMAKE_NETRC.rst
%%DATADIR%%/Help/variable/CMAKE_NETRC_FILE.rst
%%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
@@ -1349,6 +1382,8 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_PROGRAM_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_PROJECT_DESCRIPTION.rst
%%DATADIR%%/Help/variable/CMAKE_PROJECT_HOMEPAGE_URL.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_INCLUDE.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst
%%DATADIR%%/Help/variable/CMAKE_PROJECT_NAME.rst
%%DATADIR%%/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION.rst
@@ -1402,6 +1437,8 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_SYSTEM_PROGRAM_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_SYSTEM_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
+%%DATADIR%%/Help/variable/CMAKE_Swift_MODULE_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_Swift_NUM_THREADS.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
@@ -1418,6 +1455,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD.rst
%%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_JUST_MY_CODE_DEBUGGING.rst
%%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
%%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
@@ -1538,6 +1576,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Help/variable/CTEST_UPDATE_COMMAND.rst
%%DATADIR%%/Help/variable/CTEST_UPDATE_OPTIONS.rst
%%DATADIR%%/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
+%%DATADIR%%/Help/variable/CTEST_UPDATE_VERSION_OVERRIDE.rst
%%DATADIR%%/Help/variable/CTEST_USE_LAUNCHERS.rst
%%DATADIR%%/Help/variable/CYGWIN.rst
%%DATADIR%%/Help/variable/ENV.rst
@@ -1783,6 +1822,13 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/ARMCC.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-ASM.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-C.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/ARMClang.cmake
%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -1858,10 +1904,6 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/Compiler/Intel-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
%%DATADIR%%/Modules/Compiler/Intel.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-C.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
-%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
%%DATADIR%%/Modules/Compiler/MSVC-ASM.cmake
%%DATADIR%%/Modules/Compiler/MSVC-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/MSVC-C.cmake
@@ -1921,6 +1963,11 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/Compiler/XL-CXX.cmake
%%DATADIR%%/Modules/Compiler/XL-Fortran.cmake
%%DATADIR%%/Modules/Compiler/XL.cmake
+%%DATADIR%%/Modules/Compiler/XLClang-C-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/XLClang-C.cmake
+%%DATADIR%%/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/XLClang-CXX.cmake
+%%DATADIR%%/Modules/Compiler/XLClang.cmake
%%DATADIR%%/Modules/Compiler/zOS-C-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
%%DATADIR%%/Modules/CompilerId/GHS_default.gpj.in
@@ -1974,6 +2021,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/FindDevIL.cmake
%%DATADIR%%/Modules/FindDoxygen.cmake
%%DATADIR%%/Modules/FindEXPAT.cmake
+%%DATADIR%%/Modules/FindEnvModules.cmake
%%DATADIR%%/Modules/FindFLEX.cmake
%%DATADIR%%/Modules/FindFLTK.cmake
%%DATADIR%%/Modules/FindFLTK2.cmake
@@ -2178,6 +2226,9 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/Platform/AIX-XL-CXX.cmake
%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
%%DATADIR%%/Modules/Platform/AIX-XL.cmake
+%%DATADIR%%/Modules/Platform/AIX-XLClang-C.cmake
+%%DATADIR%%/Modules/Platform/AIX-XLClang-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-XLClang.cmake
%%DATADIR%%/Modules/Platform/AIX.cmake
%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
%%DATADIR%%/Modules/Platform/ARTOS.cmake
@@ -2307,7 +2358,7 @@ share/aclocal/cmake.m4
%%DATADIR%%/Modules/Platform/FreeBSD-Determine-CXX.cmake
%%DATADIR%%/Modules/Platform/FreeBSD.cmake
%%DATADIR%%/Modules/Platform/Fuchsia.cmake
-%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
+%%DATADIR%%/Modules/Platform/GHS-MULTI-Determine.cmake
%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
%%DATADIR%%/Modules/Platform/GNU.cmake
%%DATADIR%%/Modules/Platform/GNUtoMS_lib.bat.in
@@ -2559,6 +2610,5 @@ share/aclocal/cmake.m4
%%DATADIR%%/editors/vim/syntax/cmake.vim
%%DATADIR%%/include/cmCPluginAPI.h
%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/cmcompress/Copyright.txt
%%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt
share/emacs/site-lisp/cmake-mode.el
Modified: head/devel/kms-cmake-utils/pkg-plist
==============================================================================
--- head/devel/kms-cmake-utils/pkg-plist Wed Aug 14 13:50:28 2019 (r508921)
+++ head/devel/kms-cmake-utils/pkg-plist Wed Aug 14 14:18:36 2019 (r508922)
@@ -1,10 +1,10 @@
-share/cmake-3.14/Modules/CommonBuildFlags.cmake
-share/cmake-3.14/Modules/DpkgBuildFlags.cmake
-share/cmake-3.14/Modules/FindGLIB-GENMARSHAL.cmake
-share/cmake-3.14/Modules/FindGLIB-MKENUMS.cmake
-share/cmake-3.14/Modules/FindKurentoHelpers.cmake
-share/cmake-3.14/Modules/GLibHelpers.cmake
-share/cmake-3.14/Modules/GenericFind.cmake
-share/cmake-3.14/Modules/KurentoGitHelpers.cmake
-share/cmake-3.14/Modules/TestHelpers.cmake
-share/cmake-3.14/Modules/VersionHelpers.cmake
+share/cmake-3.15/Modules/CommonBuildFlags.cmake
+share/cmake-3.15/Modules/DpkgBuildFlags.cmake
+share/cmake-3.15/Modules/FindGLIB-GENMARSHAL.cmake
+share/cmake-3.15/Modules/FindGLIB-MKENUMS.cmake
+share/cmake-3.15/Modules/FindKurentoHelpers.cmake
+share/cmake-3.15/Modules/GLibHelpers.cmake
+share/cmake-3.15/Modules/GenericFind.cmake
+share/cmake-3.15/Modules/KurentoGitHelpers.cmake
+share/cmake-3.15/Modules/TestHelpers.cmake
+share/cmake-3.15/Modules/VersionHelpers.cmake
Added: head/graphics/peruse/files/patch-src_qtquick_karchive_rar_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/peruse/files/patch-src_qtquick_karchive_rar_CMakeLists.txt Wed Aug 14 14:18:36 2019 (r508922)
@@ -0,0 +1,57 @@
+commit bea1c027ed5c863ae21df895d62d7a519bc24eaf
+Author: Adriaan de Groot <groot at kde.org>
+Date: Sat Aug 10 21:54:33 2019 +0200
+
+ Fix build with CMake 3.15
+
+ Summary:
+ - The build flags for the C part of the library overwrite the
+ compile flags for C++, in particular, they add -std=c99
+ to the C++ compilation.
+ - The C parts get auto-mocced (!) which generates a C++
+ file (although it's empty), which then gets compiled with
+ the C flags (and weird -std= setting).
+ - For clang, that leads to a build failure.
+
+ So switch out some things:
+
+ - Build the C parts as an OBJECT library,
+ - Don't apply the C flags to anything but that OBJECT library,
+ - and don't automoc C code.
+
+ Test Plan: It now builds when CMake 3.15.2 is used.
+
+ Reviewers: leinir
+
+ Differential Revision: https://phabricator.kde.org/D23076
+diff --git src/qtquick/karchive-rar/CMakeLists.txt src/qtquick/karchive-rar/CMakeLists.txt
+index 3928dfd..022ecd1 100644
+--- src/qtquick/karchive-rar/CMakeLists.txt
++++ src/qtquick/karchive-rar/CMakeLists.txt
+@@ -2,10 +2,6 @@ project(karchive-rar)
+
+ find_package(ZLIB)
+
+-if (UNIX OR MINGW)
+- add_compile_options(-std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
+-endif (UNIX OR MINGW)
+-
+ set(unarr_SRCS
+ unarr/rar/uncompress-rar.c
+ unarr/rar/huffman-rar.c
+@@ -31,7 +27,14 @@ set(karchive_rar_SRCS
+ KRarFileEntry.cpp
+ )
+
+-add_library(karchive-rar STATIC ${karchive_rar_SRCS} ${unarr_SRCS})
++add_library(karchive-c-unarr OBJECT ${unarr_SRCS})
++if (UNIX OR MINGW)
++ target_compile_options(karchive-c-unarr PRIVATE -std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
++ set_property(TARGET karchive-c-unarr PROPERTY AUTOMOC OFF)
++endif (UNIX OR MINGW)
++
++
++add_library(karchive-rar STATIC ${karchive_rar_SRCS} $<TARGET_OBJECTS:karchive-c-unarr>)
+ target_link_libraries(karchive-rar
+ PUBLIC KF5::Archive
+ )
Added: head/misc/libemos/files/patch-libemos-dp_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/libemos/files/patch-libemos-dp_CMakeLists.txt Wed Aug 14 14:18:36 2019 (r508922)
@@ -0,0 +1,13 @@
+Fix build: the symlink to libemosR64.a was not created
+in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.
+
+--- libemos-dp/CMakeLists.txt.orig 2019-08-10 23:48:55 UTC
++++ libemos-dp/CMakeLists.txt
+@@ -42,6 +42,6 @@ ecbuild_add_library(
+ # libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
+ #else()
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+- libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
++ libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
+ #endif()
+
Added: head/misc/libemos/files/patch-libemos-sp_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/libemos/files/patch-libemos-sp_CMakeLists.txt Wed Aug 14 14:18:36 2019 (r508922)
@@ -0,0 +1,13 @@
+Fix build: the symlink to libemosR64.a was not created
+in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.
+
+--- libemos-sp/CMakeLists.txt.orig 2019-08-10 23:49:07 UTC
++++ libemos-sp/CMakeLists.txt
+@@ -45,6 +45,6 @@ ecbuild_add_library(
+ # libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
+ #else()
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+- libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
++ libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
+ #endif()
+
Modified: head/misc/libemos/pkg-plist
==============================================================================
--- head/misc/libemos/pkg-plist Wed Aug 14 13:50:28 2019 (r508921)
+++ head/misc/libemos/pkg-plist Wed Aug 14 14:18:36 2019 (r508922)
@@ -31,6 +31,8 @@ include/libemos/libemos_config.h
include/libemos/libemos_ecbuild_config.h
include/libemos/libemos_version.h
lib/libemos.a
+lib/libemos.R32.D64.I32.a
+lib/libemos.R64.D64.I32.a
lib/libemosR64.a
libdata/pkgconfig/libemos.pc
libdata/pkgconfig/libemosR64.pc
More information about the svn-ports-all
mailing list