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 1e263065e12435ade250d83ab04e61c4453b12fe (commit)
via c92f5f6a7325c8a6c3b07d7a36a94c474d7ea977 (commit)
via d770b9521292a9dbb6a2d20e4779afa379b79699 (commit)
via 119643f630a4f5b710b6c88abab9f85490bc6286 (commit)
via 2919f65c2463c168c5a054e48a99a51dcdb86f60 (commit)
via b39d240f5dbb3e7bcc07ad1b158a8ef8172bfe78 (commit)
via 30eee7702f5fdd331fec80539b6c33ba36652aaa (commit)
via 2bbbc4ce1ff7d7d0cbbdc1d89cff023b754cc35f (commit)
via edec1c261519525acd01ad67192f777fa071c50b (commit)
via 2ba5c37b3fed00ecc307b1d93780acd4a57695eb (commit)
via 7113b943463d4a9c9df7d7385856394cbcfe8de7 (commit)
via 1ff1f757182139914aa2d3d4e51509ef89f48241 (commit)
via 9334a4b472234e24969555f191e09302cf725265 (commit)
via e28240ea1f2d296f99474bb6a709a6d4d7bb1cfa (commit)
via c2595a4958963e3cdd5276420a15a7735176c50d (commit)
via 39c572c9c932802595eb50594e24c961cfa1151b (commit)
via f68492912c11f10724518896d87555b82fec894a (commit)
from c86476549653f9915a4b9f4cc32d3e569f959d38 (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=1e263065e12435ade250d83ab04e61c4453b12fe
commit 1e263065e12435ade250d83ab04e61c4453b12fe
Merge: c92f5f6 39c572c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:12:01 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:12:24 2019 -0400
Merge topic 'findmpi_use_interface_link_options'
39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3476
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c92f5f6a7325c8a6c3b07d7a36a94c474d7ea977
commit c92f5f6a7325c8a6c3b07d7a36a94c474d7ea977
Merge: d770b95 c2595a4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:11:27 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:11:34 2019 -0400
Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute'
c2595a4958 FindMatlab: removing spaces in compiler define
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3473
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d770b9521292a9dbb6a2d20e4779afa379b79699
commit d770b9521292a9dbb6a2d20e4779afa379b79699
Merge: 119643f e28240e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:09:20 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:10:43 2019 -0400
Merge topic 'protobuf-c++11'
e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3470
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=119643f630a4f5b710b6c88abab9f85490bc6286
commit 119643f630a4f5b710b6c88abab9f85490bc6286
Merge: 2919f65 f684929
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:09:05 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:09:34 2019 -0400
Merge topic 'find-testlist'
f68492912c Tests: reduce code duplication for CMake_TEST_Find*
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3471
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2919f65c2463c168c5a054e48a99a51dcdb86f60
commit 2919f65c2463c168c5a054e48a99a51dcdb86f60
Merge: b39d240 1ff1f75
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:08:27 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:08:36 2019 -0400
Merge topic 'fix-xcode6-compilation'
1ff1f75718 Fix Xcode 6.1.1 compilation issue
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3480
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b39d240f5dbb3e7bcc07ad1b158a8ef8172bfe78
commit b39d240f5dbb3e7bcc07ad1b158a8ef8172bfe78
Merge: 30eee77 2bbbc4c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 07:06:30 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 26 07:06:30 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30eee7702f5fdd331fec80539b6c33ba36652aaa
commit 30eee7702f5fdd331fec80539b6c33ba36652aaa
Merge: c864765 2ba5c37
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:00:14 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:03:25 2019 -0400
Merge topic 'export-targets-empty'
2ba5c37b3f export: Restore support for empty TARGETS list
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3484
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ff1f757182139914aa2d3d4e51509ef89f48241
commit 1ff1f757182139914aa2d3d4e51509ef89f48241
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Tue Jun 25 17:13:45 2019 +0200
Commit: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
CommitDate: Tue Jun 25 17:34:56 2019 +0200
Fix Xcode 6.1.1 compilation issue
diff --git a/Source/cmRuntimeDependencyArchive.cxx
b/Source/cmRuntimeDependencyArchive.cxx
index b4c6c32..a1d1f95 100644
--- a/Source/cmRuntimeDependencyArchive.cxx
+++ b/Source/cmRuntimeDependencyArchive.cxx
@@ -342,10 +342,7 @@ void cmRuntimeDependencyArchive::AddResolvedPath(const
std::string& name,
const std::string& path,
bool& unique)
{
- auto it =
- this->ResolvedPaths
- .insert(std::pair<std::string, std::set<std::string>>{ name, {} })
- .first;
+ auto it = this->ResolvedPaths.emplace(name, std::set<std::string>{}).first;
unique = true;
for (auto const& other : it->second) {
if (cmSystemTools::SameFile(path, other)) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e28240ea1f2d296f99474bb6a709a6d4d7bb1cfa
commit e28240ea1f2d296f99474bb6a709a6d4d7bb1cfa
Author: Rolf Eike Beer <e...@emlix.com>
AuthorDate: Mon Jun 24 13:30:18 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Tue Jun 25 15:22:01 2019 +0200
FindProtobuf: C++11 support is required since version 3.6.0
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 76bc873..085e96c 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -521,6 +521,11 @@ if(Protobuf_INCLUDE_DIR)
set_target_properties(protobuf::libprotobuf PROPERTIES
IMPORTED_LOCATION_DEBUG "${Protobuf_LIBRARY_DEBUG}")
endif()
+ if (Protobuf_VERSION VERSION_GREATER_EQUAL "3.6")
+ set_property(TARGET protobuf::libprotobuf APPEND PROPERTY
+ INTERFACE_COMPILE_FEATURES cxx_std_11
+ )
+ endif()
if(UNIX AND TARGET Threads::Threads)
set_property(TARGET protobuf::libprotobuf APPEND PROPERTY
INTERFACE_LINK_LIBRARIES Threads::Threads)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2595a4958963e3cdd5276420a15a7735176c50d
commit c2595a4958963e3cdd5276420a15a7735176c50d
Author: Raffi Enficiaud <raffi.enfici...@mines-paris.org>
AuthorDate: Mon Jun 24 20:17:47 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 25 07:24:01 2019 -0400
FindMatlab: removing spaces in compiler define
Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))`
are causing a compilation error.
Fixes: #19279
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 3547642..bcc7f67 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -1053,7 +1053,7 @@ function(matlab_add_mex)
# This one is weird, it might be a bug in <mex.h> for R2018b. When
compiling with
# -fvisibility=hidden, the symbol `mexFunction` cannot be exported.
Reading the
# source code for <mex.h>, it seems that the preprocessor macro
`MW_NEEDS_VERSION_H`
- # needs to be defined for `__attribute__ ((visibility("default")))` to
be added
+ # needs to be defined for `__attribute__((visibility("default")))` to be
added
# in front of the declaration of `mexFunction`. In previous versions of
MATLAB this
# was not the case, there `DLL_EXPORT_SYM` needed to be defined.
# Adding `-fvisibility=hidden` to the `mex` command causes the build to
fail.
@@ -1089,11 +1089,13 @@ function(matlab_add_mex)
set(_link_flags "${_link_flags} -Wl,${_export_flag_name},${_file}")
endforeach()
+ # The `mex` command doesn't add this define. It is specified here in order
+ # to export the symbol in case the client code decides to hide its symbols
set_target_properties(${${prefix}_NAME}
PROPERTIES
- DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility
(\"default\")))"
+ DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__((visibility(\"default\")))"
LINK_FLAGS "${_link_flags}"
- ) # The `mex` command doesn't add this define. Is it necessary?
+ )
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39c572c9c932802595eb50594e24c961cfa1151b
commit 39c572c9c932802595eb50594e24c961cfa1151b
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Mon Jun 24 16:45:44 2019 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Mon Jun 24 16:45:44 2019 -0400
FindMPI: Updated to use INTERFACE_LINK_OPTIONS
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index a80f799..fc9810c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1142,16 +1142,15 @@ macro(_MPI_create_imported_target LANG)
set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_COMPILE_DEFINITIONS
"${MPI_${LANG}_COMPILE_DEFINITIONS}")
- set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_LIBRARIES "")
if(MPI_${LANG}_LINK_FLAGS)
separate_arguments(_MPI_${LANG}_LINK_FLAGS NATIVE_COMMAND
"${MPI_${LANG}_LINK_FLAGS}")
- set_property(TARGET MPI::MPI_${LANG} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "${_MPI_${LANG}_LINK_FLAGS}")
+ set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS
"${_MPI_${LANG}_LINK_FLAGS}")
unset(_MPI_${LANG}_LINK_FLAGS)
endif()
# If the compiler links MPI implicitly, no libraries will be found as
they're contained within
# CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES already.
if(MPI_${LANG}_LIBRARIES)
- set_property(TARGET MPI::MPI_${LANG} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "${MPI_${LANG}_LIBRARIES}")
+ set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_LIBRARIES
"${MPI_${LANG}_LIBRARIES}")
endif()
# Given the new design of FindMPI, INCLUDE_DIRS will always be located, even
under implicit linking.
set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_INCLUDE_DIRECTORIES
"${MPI_${LANG}_INCLUDE_DIRS}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f68492912c11f10724518896d87555b82fec894a
commit f68492912c11f10724518896d87555b82fec894a
Author: Rolf Eike Beer <e...@emlix.com>
AuthorDate: Mon Jun 24 13:47:31 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jun 24 18:31:53 2019 +0200
Tests: reduce code duplication for CMake_TEST_Find*
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 920af04..50aff8b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1398,184 +1398,66 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir
dev -- '${CMake_BUILD_NIGH
endif()
endif()
- if(CMake_TEST_FindALSA)
- add_subdirectory(FindALSA)
- endif()
+ # test for Find modules, simple cases
+ foreach(_mod IN ITEMS
+ ALSA
+ Boost
+ BZip2
+ CURL
+ Cups
+ Doxygen
+ EnvModules
+ EXPAT
+ Fontconfig
+ Freetype
+ GDAL
+ GIF
+ Git
+ GLEW
+ GSL
+ GTK2
+ Iconv
+ ICU
+ JPEG
+ JsonCpp
+ LibLZMA
+ LibRHash
+ Libinput
+ LibUV
+ LibXml2
+ LTTngUST
+ ODBC
+ OpenCL
+ OpenGL
+ OpenMP
+ OpenSSL
+ MPI
+ PNG
+ Patch
+ PostgreSQL
+ Protobuf
+ SQLite3
+ TIFF
+ Vulkan
+ X11
+ XalanC
+ XercesC
+ )
+ if(CMake_TEST_Find${_mod})
+ add_subdirectory(Find${_mod})
+ endif()
+ endforeach()
if(CMake_TEST_CUDA)
add_subdirectory(Cuda)
add_subdirectory(CudaOnly)
endif()
- if(CMake_TEST_FindBoost)
- add_subdirectory(FindBoost)
- endif()
-
- if(CMake_TEST_FindBZip2)
- add_subdirectory(FindBZip2)
- endif()
-
- if(CMake_TEST_FindCURL)
- add_subdirectory(FindCURL)
- endif()
-
- if(CMake_TEST_FindCups)
- add_subdirectory(FindCups)
- endif()
-
- if(CMake_TEST_FindDoxygen)
- add_subdirectory(FindDoxygen)
- endif()
-
- if(CMake_TEST_FindEnvModules)
- add_subdirectory(FindEnvModules)
- endif()
-
- if(CMake_TEST_FindEXPAT)
- add_subdirectory(FindEXPAT)
- endif()
-
- if(CMake_TEST_FindFontconfig)
- add_subdirectory(FindFontconfig)
- endif()
-
- if(CMake_TEST_FindFreetype)
- add_subdirectory(FindFreetype)
- endif()
-
- if(CMake_TEST_FindGDAL)
- add_subdirectory(FindGDAL)
- endif()
-
- if(CMake_TEST_FindGIF)
- add_subdirectory(FindGIF)
- endif()
-
- if(CMake_TEST_FindGit)
- add_subdirectory(FindGit)
- endif()
-
- if(CMake_TEST_FindGLEW)
- add_subdirectory(FindGLEW)
- endif()
-
- if(CMake_TEST_FindGSL)
- add_subdirectory(FindGSL)
- endif()
-
if(CMake_TEST_FindGTest)
add_subdirectory(FindGTest)
add_subdirectory(GoogleTest)
endif()
- if(CMake_TEST_FindGTK2)
- add_subdirectory(FindGTK2)
- endif()
-
- if(CMake_TEST_FindIconv)
- add_subdirectory(FindIconv)
- endif()
-
- if(CMake_TEST_FindICU)
- add_subdirectory(FindICU)
- endif()
-
- if(CMake_TEST_FindJPEG)
- add_subdirectory(FindJPEG)
- endif()
-
- if(CMake_TEST_FindJsonCpp)
- add_subdirectory(FindJsonCpp)
- endif()
-
- if(CMake_TEST_FindLibLZMA)
- add_subdirectory(FindLibLZMA)
- endif()
-
- if(CMake_TEST_FindLibRHash)
- add_subdirectory(FindLibRHash)
- endif()
-
- if(CMake_TEST_FindLibinput)
- add_subdirectory(FindLibinput)
- endif()
-
- if(CMake_TEST_FindLibUV)
- add_subdirectory(FindLibUV)
- endif()
-
- if(CMake_TEST_FindLibXml2)
- add_subdirectory(FindLibXml2)
- endif()
-
- if(CMake_TEST_FindLTTngUST)
- add_subdirectory(FindLTTngUST)
- endif()
-
- if(CMake_TEST_FindODBC)
- add_subdirectory(FindODBC)
- endif()
-
- if(CMake_TEST_FindOpenCL)
- add_subdirectory(FindOpenCL)
- endif()
-
- if(CMake_TEST_FindOpenGL)
- add_subdirectory(FindOpenGL)
- endif()
-
- if(CMake_TEST_FindOpenMP)
- add_subdirectory(FindOpenMP)
- endif()
-
- if(CMake_TEST_FindOpenSSL)
- add_subdirectory(FindOpenSSL)
- endif()
-
- if(CMake_TEST_FindMPI)
- add_subdirectory(FindMPI)
- endif()
-
- if(CMake_TEST_FindPNG)
- add_subdirectory(FindPNG)
- endif()
-
- if(CMake_TEST_FindPatch)
- add_subdirectory(FindPatch)
- endif()
-
- if(CMake_TEST_FindPostgreSQL)
- add_subdirectory(FindPostgreSQL)
- endif()
-
- if(CMake_TEST_FindProtobuf)
- add_subdirectory(FindProtobuf)
- endif()
-
- if(CMake_TEST_FindSQLite3)
- add_subdirectory(FindSQLite3)
- endif()
-
- if(CMake_TEST_FindTIFF)
- add_subdirectory(FindTIFF)
- endif()
-
- if(CMake_TEST_FindVulkan)
- add_subdirectory(FindVulkan)
- endif()
-
- if(CMake_TEST_FindX11)
- add_subdirectory(FindX11)
- endif()
-
- if(CMake_TEST_FindXalanC)
- add_subdirectory(FindXalanC)
- endif()
-
- if(CMake_TEST_FindXercesC)
- add_subdirectory(FindXercesC)
- endif()
-
if(CMake_TEST_FindPython OR CMake_TEST_FindPython_NumPy)
add_subdirectory(FindPython)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMPI.cmake | 5 +-
Modules/FindMatlab.cmake | 8 +-
Modules/FindProtobuf.cmake | 5 +
Source/cmExportCommand.cxx | 11 +-
Source/cmRuntimeDependencyArchive.cxx | 5 +-
Tests/CMakeLists.txt | 216 +++++++------------------------
Tests/RunCMake/export/Empty.cmake | 1 +
Tests/RunCMake/export/RunCMakeTest.cmake | 1 +
8 files changed, 73 insertions(+), 179 deletions(-)
create mode 100644 Tests/RunCMake/export/Empty.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
