[Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-188-g41d796b
Kitware Robot
kwrobot at kitware.com
Mon Oct 30 09:05:04 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 41d796be155e0da8fec66cb281429ed0eb91650d (commit)
via 2ad3576594b3009775c4caba9b8b5f952f9e0e27 (commit)
via ccf1155977e5bf51c64c3ae34d9603a389da278b (commit)
via 9bfc43a5e5f82f9477ea761cc739fa289e3b92e2 (commit)
via 469ac58925554bdea3f73cb77e99e9787d7bef95 (commit)
via 58e0692b62b5be1703142e8d7cc2373c8cee7508 (commit)
via da00080ed495535c4ca1a20c3133f4830c32b4a3 (commit)
via a8bf0b2b376cf61f6fb3d2a504021a589aed32d5 (commit)
via 5784ab8fcab556d4d73b15b7d84bf167daf4c5a2 (commit)
via 3d42c3eda2ed65e1b510d76f28330b42263edffa (commit)
via 0504fc8d84f00431d30e68c685d4ca86ed18133a (commit)
via dc4d2021e121e045a881ebed758d0ab977205621 (commit)
via f01576012f17d5552bc37d8f436ef7e3b47b3a86 (commit)
via 82f95c958467b3076372247d9a0a7d6d0414c96e (commit)
from e48397ee2930090ff41c8febeea27542b4580ec0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41d796be155e0da8fec66cb281429ed0eb91650d
commit 41d796be155e0da8fec66cb281429ed0eb91650d
Merge: 2ad3576 82f95c9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 30 13:04:32 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 30 09:04:37 2017 -0400
Merge topic 'vs-diagnostics-flag'
82f95c95 VS generator: support /diagnostics compiler flag
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1411
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad3576594b3009775c4caba9b8b5f952f9e0e27
commit 2ad3576594b3009775c4caba9b8b5f952f9e0e27
Merge: ccf1155 469ac58
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 30 09:02:59 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 30 09:02:59 2017 -0400
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccf1155977e5bf51c64c3ae34d9603a389da278b
commit ccf1155977e5bf51c64c3ae34d9603a389da278b
Merge: 9bfc43a 3d42c3e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 30 12:58:57 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 30 08:59:00 2017 -0400
Merge topic 'freetype-windows'
3d42c3ed FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1416
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bfc43a5e5f82f9477ea761cc739fa289e3b92e2
commit 9bfc43a5e5f82f9477ea761cc739fa289e3b92e2
Merge: 58e0692 a8bf0b2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 30 12:58:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 30 08:58:26 2017 -0400
Merge topic 'autogen-qrc-file-name'
a8bf0b2b Autogen: RCC: Append checksum suffix to wrapped file name
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1422
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58e0692b62b5be1703142e8d7cc2373c8cee7508
commit 58e0692b62b5be1703142e8d7cc2373c8cee7508
Merge: e48397e 5784ab8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 30 12:55:34 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 30 08:55:36 2017 -0400
Merge topic 'cpack-deb-0-so-version-support'
5784ab8f CPack/Deb: handle shlibs file generation when SOVERSION set to 0
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1423
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5784ab8fcab556d4d73b15b7d84bf167daf4c5a2
commit 5784ab8fcab556d4d73b15b7d84bf167daf4c5a2
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Oct 29 00:16:06 2017 +0200
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Oct 29 00:20:54 2017 +0200
CPack/Deb: handle shlibs file generation when SOVERSION set to 0
Setting CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS did not
auto generate shlibs control file when .so version
of the library was set to 0.
Fixes #17318
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 1879827..91bf2f2 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -987,7 +987,7 @@ function(cpack_deb_prepare_package_vars)
if(READELF_EXECUTABLE)
foreach(_FILE IN LISTS CPACK_DEB_SHARED_OBJECT_FILES)
extract_so_info("${_FILE}" libname soversion)
- if(libname AND soversion)
+ if(libname AND DEFINED soversion)
list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST
"${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_DEBIAN_PACKAGE_VERSION})")
else()
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index aa55c44..b00e373 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -12,7 +12,7 @@ run_cpack_test(DIST "RPM" false "MONOLITHIC")
run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true "MONOLITHIC;COMPONENT")
run_cpack_test(VERSION "RPM;DEB" false "MONOLITHIC;COMPONENT")
run_cpack_test(EXTRA "DEB" false "COMPONENT")
-run_cpack_test(GENERATE_SHLIBS "DEB" true "COMPONENT")
+run_cpack_test_subtests(GENERATE_SHLIBS "soversion_not_zero;soversion_zero" "DEB" true "COMPONENT")
run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true "COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
diff --git a/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/VerifyResult.cmake
index b1952ef..8cefeea 100644
--- a/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/VerifyResult.cmake
@@ -1,4 +1,9 @@
-set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs \\(\\= 0\\.1\\.1\\)\n$")
+if(RunCMake_SUBTEST_SUFFIX STREQUAL "soversion_not_zero")
+ set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs \\(\\= 0\\.1\\.1\\)\n$")
+else() # soversion_zero
+ set(shlibs_shlibs "^libtest_lib 0 generate_shlibs \\(\\= 0\\.1\\.1\\)\n$")
+endif()
+
# optional dot at the end of permissions regex is for SELinux enabled systems
set(shlibs_shlibs_permissions_regex "-rw-r--r--\.? .*")
verifyDebControl("${FOUND_FILE_1}" "shlibs" "shlibs")
diff --git a/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/test.cmake b/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/test.cmake
index 90351ba..e0eb67b 100644
--- a/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/test.cmake
+++ b/Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/test.cmake
@@ -9,6 +9,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
"#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
-set_target_properties(test_lib PROPERTIES SOVERSION "0.8")
+
+if(RunCMake_SUBTEST_SUFFIX STREQUAL "soversion_not_zero")
+ set_target_properties(test_lib PROPERTIES SOVERSION "0.8")
+else() # soversion_zero
+ set_target_properties(test_lib PROPERTIES SOVERSION "0")
+endif()
install(TARGETS test_lib DESTINATION foo COMPONENT libs)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d42c3eda2ed65e1b510d76f28330b42263edffa
commit 3d42c3eda2ed65e1b510d76f28330b42263edffa
Author: Mark Salisbury <mark.salisbury at hp.com>
AuthorDate: Thu Oct 26 09:46:06 2017 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 27 10:52:14 2017 -0400
FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified
On Windows if you specify the library path using a regular Windows
path with backslashes, FindFreetype announces that it found the library,
but the value is reported with backslashes instead of forward slashes.
This breaks assumptions elsewhere in CMake. Convert slashes explicitly
since we have no `find_library` call for `FREETYPE_LIBRARY`.
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 0e6d336..2acb4bc 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -115,6 +115,9 @@ if(NOT FREETYPE_LIBRARY)
)
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
select_library_configurations(FREETYPE)
+else()
+ # on Windows, ensure paths are in canonical format (forward slahes):
+ file(TO_CMAKE_PATH "${FREETYPE_LIBRARY}" FREETYPE_LIBRARY)
endif()
unset(FREETYPE_FIND_ARGS)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82f95c958467b3076372247d9a0a7d6d0414c96e
commit 82f95c958467b3076372247d9a0a7d6d0414c96e
Author: Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Wed Oct 25 12:09:48 2017 -0700
Commit: Justin Goshi <jgoshi at microsoft.com>
CommitDate: Wed Oct 25 12:09:48 2017 -0700
VS generator: support /diagnostics compiler flag
Adding support for this flag so a user can specify it
via the CMAKE_CXX_FLAGS variable.
diff --git a/Source/cmVS141CLFlagTable.h b/Source/cmVS141CLFlagTable.h
index c780d46..7d3e356 100644
--- a/Source/cmVS141CLFlagTable.h
+++ b/Source/cmVS141CLFlagTable.h
@@ -1,6 +1,10 @@
static cmVS7FlagTable cmVS141CLFlagTable[] = {
// Enum Properties
+ { "DiagnosticsFormat", "diagnostics:classic", "Classic", "Classic", 0 },
+ { "DiagnosticsFormat", "diagnostics:column", "Column", "Column", 0 },
+ { "DiagnosticsFormat", "diagnostics:caret", "Caret", "Caret", 0 },
+
{ "DebugInformationFormat", "", "None", "None", 0 },
{ "DebugInformationFormat", "Z7", "C7 compatible", "OldStyle", 0 },
{ "DebugInformationFormat", "Zi", "Program Database", "ProgramDatabase", 0 },
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 2 +-
Modules/FindFreetype.cmake | 3 +++
Source/cmQtAutoGenerators.cxx | 20 +++++++++++++++-----
Source/cmVS141CLFlagTable.h | 4 ++++
Tests/RunCMake/CPack/RunCMakeTest.cmake | 2 +-
.../CPack/tests/GENERATE_SHLIBS/VerifyResult.cmake | 7 ++++++-
.../CPack/tests/GENERATE_SHLIBS/test.cmake | 7 ++++++-
7 files changed, 36 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list