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 0a104224182565645b6bb8a1f81031c5afdc67ed (commit)
via 7af2dedc0895e0ba685b49092c7ec48b3468e833 (commit)
via 1b5a7adf5e5b9343f6f6dc608b1dee0b17316af8 (commit)
via cc7f1be54e923a8459279638594238650c9a0529 (commit)
via a45f061296f6646c2633333fa034758dd23783d5 (commit)
via e2b4fa114184a0a8eeec9c8005e09f70a8ae6832 (commit)
via 9c7ea95ab0961d6f0b6b317a45fbde9cb65dab1b (commit)
via 2746c61e6d36f3d49744b11259395a8684007e9f (commit)
via 8a08d0c0926a9f950ff49d5547b374c0bd282440 (commit)
via 63bf207cd67972785fba5d48533022e0945f0bd7 (commit)
via 68dcbeee01a301876011a8310509e3860cbb9b34 (commit)
via 34a7e5ab587f5441ed5854b6ad9a159f3af88365 (commit)
from db7fc1e04507fc18475c0af0dacd7b45b4f69389 (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=0a104224182565645b6bb8a1f81031c5afdc67ed
commit 0a104224182565645b6bb8a1f81031c5afdc67ed
Merge: 7af2ded 63bf207
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 11:58:39 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 18 07:59:46 2019 -0400
Merge topic 'cxx_lambda_init_captures_document_why_not_supported_on_gcc48'
63bf207cd6 CompileFeatures: document why lambda_init_captures requires GCC
4.9
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3452
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7af2dedc0895e0ba685b49092c7ec48b3468e833
commit 7af2dedc0895e0ba685b49092c7ec48b3468e833
Merge: 1b5a7ad 68dcbee
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 11:58:21 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 18 07:58:48 2019 -0400
Merge topic 'implicit_lapack_library'
68dcbeee01 FindLAPACK: Test for implicitly linked LAPACK libraries
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3451
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b5a7adf5e5b9343f6f6dc608b1dee0b17316af8
commit 1b5a7adf5e5b9343f6f6dc608b1dee0b17316af8
Merge: cc7f1be 2746c61
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 11:57:46 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 18 07:57:56 2019 -0400
Merge topic 'library-search-paths'
2746c61e6d Swift: Add library search paths for dependencies
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3436
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc7f1be54e923a8459279638594238650c9a0529
commit cc7f1be54e923a8459279638594238650c9a0529
Merge: a45f061 e2b4fa1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 07:57:33 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 18 07:57:33 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a45f061296f6646c2633333fa034758dd23783d5
commit a45f061296f6646c2633333fa034758dd23783d5
Merge: 9c7ea95 8a08d0c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 11:55:49 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 18 07:56:08 2019 -0400
Merge topic 'doc-project-include'
8a08d0c092 Help: Document what project() calls use CMAKE_PROJECT_INCLUDE
and friends
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3453
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c7ea95ab0961d6f0b6b317a45fbde9cb65dab1b
commit 9c7ea95ab0961d6f0b6b317a45fbde9cb65dab1b
Merge: db7fc1e 34a7e5a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 18 11:54:27 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 18 07:54:39 2019 -0400
Merge topic 'tutorial-fix-version'
34a7e5ab58 Tests/Tutorial: Fix version displayed in tutorial executable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3448
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2746c61e6d36f3d49744b11259395a8684007e9f
commit 2746c61e6d36f3d49744b11259395a8684007e9f
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Jun 9 12:51:00 2019 -0700
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 17 14:09:15 2019 -0400
Swift: Add library search paths for dependencies
When building Swift executables and libraries which import a module, an
implicit link will be added by the driver. Because this links by name
rather than path, the library search path needs to be provided to
indicate where to find the library. For all local dependencies, add the
library paths for the targets when linking. This ensures that you can
link against local libraries without explicitly setting a library path.
Fixes: #19304
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 2a8bee6..469faca 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -99,14 +99,34 @@ std::string cmLinkLineComputer::ComputeLinkPath(
std::string const& libPathTerminator)
{
std::string linkPath;
- std::vector<std::string> const& libDirs = cli.GetDirectories();
- for (std::string const& libDir : libDirs) {
- std::string libpath = this->ConvertToOutputForExisting(libDir);
- linkPath += " " + libPathFlag;
- linkPath += libpath;
- linkPath += libPathTerminator;
- linkPath += " ";
+
+ if (cli.GetLinkLanguage() == "Swift") {
+ for (const cmComputeLinkInformation::Item& item : cli.GetItems()) {
+ const cmGeneratorTarget* target = item.Target;
+ if (!target) {
+ continue;
+ }
+
+ if (target->GetType() == cmStateEnums::STATIC_LIBRARY ||
+ target->GetType() == cmStateEnums::SHARED_LIBRARY) {
+ cmStateEnums::ArtifactType type = cmStateEnums::RuntimeBinaryArtifact;
+ if (target->GetType() == cmStateEnums::SHARED_LIBRARY &&
+ target->IsDLLPlatform()) {
+ type = cmStateEnums::ImportLibraryArtifact;
+ }
+
+ linkPath += " " + libPathFlag +
+ item.Target->GetDirectory(cli.GetConfig(), type) +
+ libPathTerminator + " ";
+ }
+ }
}
+
+ for (std::string const& libDir : cli.GetDirectories()) {
+ linkPath += " " + libPathFlag + this->ConvertToOutputForExisting(libDir) +
+ libPathTerminator + " ";
+ }
+
return linkPath;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63bf207cd67972785fba5d48533022e0945f0bd7
commit 63bf207cd67972785fba5d48533022e0945f0bd7
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Jun 14 16:50:52 2019 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Mon Jun 17 09:20:03 2019 -0400
CompileFeatures: document why lambda_init_captures requires GCC 4.9
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
index d18adaf..45c5470 100644
--- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
@@ -18,18 +18,18 @@ set(_cmake_feature_test_cxx_attribute_deprecated
"${GNU49_CXX14}")
set(_cmake_feature_test_cxx_decltype_auto "${GNU49_CXX14}")
set(_cmake_feature_test_cxx_digit_separators "${GNU49_CXX14}")
set(_cmake_feature_test_cxx_generic_lambdas "${GNU49_CXX14}")
-set(_cmake_feature_test_cxx_lambda_init_captures "${GNU49_CXX14}")
# GNU 4.3 supports binary literals as an extension, but may warn about
# use of extensions prior to GNU 4.9
#
http://stackoverflow.com/questions/16334024/difference-between-gcc-binary-literals-and-c14-ones
set(_cmake_feature_test_cxx_binary_literals "${GNU49_CXX14}")
-# The feature below is documented as available in GNU 4.8 (by implementing an
+# The features below are documented as available in GNU 4.8 (by implementing an
# earlier draft of the standard paper), but that version of the compiler
# does not set __cplusplus to a value greater than 201103L until GNU 4.9:
#
http://gcc.gnu.org/onlinedocs/gcc-4.8.2/cpp/Standard-Predefined-Macros.html#Standard-Predefined-Macros
#
http://gcc.gnu.org/onlinedocs/gcc-4.9.0/cpp/Standard-Predefined-Macros.html#Standard-Predefined-Macros
# So, CMake only reports availability for it with GNU 4.9 or later.
set(_cmake_feature_test_cxx_return_type_deduction "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_lambda_init_captures "${GNU49_CXX14}")
# Introduced in GCC 4.8.1
set(GNU481_CXX11 "((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 +
__GNUC_PATCHLEVEL__) >= 40801) && __cplusplus >= 201103L")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68dcbeee01a301876011a8310509e3860cbb9b34
commit 68dcbeee01a301876011a8310509e3860cbb9b34
Author: Jakub Benda <jacob.be...@gmail.com>
AuthorDate: Tue Jun 11 16:26:51 2019 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 17 08:56:05 2019 -0400
FindLAPACK: Test for implicitly linked LAPACK libraries
Apply the change from commit 5b8f69ebe9 (FindBLAS: Detect implicitly
linked BLAS library, 2018-08-28, v3.13.0-rc1~150^2~2), to FindLAPACK
also. Typically both BLAS and LAPACK are provided the same way,
e.g. in a Cray Compiler Environment.
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index c9c3cce..844d36d 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -173,11 +173,15 @@ if(_libraries_work)
#message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endif()
-if(_libraries_work)
- set(${LIBRARIES} ${${LIBRARIES}} ${_blas} ${_threads})
-else()
- set(${LIBRARIES} FALSE)
-endif()
+ if(_libraries_work)
+ if("${_list}" STREQUAL "")
+ set(${LIBRARIES} "${LIBRARIES}-PLACEHOLDER-FOR-EMPTY-LIBRARIES")
+ else()
+ set(${LIBRARIES} ${${LIBRARIES}} ${_blas} ${_threads})
+ endif()
+ else()
+ set(${LIBRARIES} FALSE)
+ endif()
endmacro()
@@ -206,6 +210,7 @@ if(BLAS_FOUND)
#intel lapack
if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
+ if(NOT LAPACK_LIBRARIES)
if (NOT WIN32)
set(LAPACK_mkl_LM "-lm")
set(LAPACK_mkl_LDL "-ldl")
@@ -280,6 +285,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
unset(LAPACK_mkl_LM)
unset(LAPACK_mkl_LDL)
endif ()
+ endif()
endif()
if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
@@ -426,5 +432,11 @@ else()
endif()
endif()
+# On compilers that implicitly link LAPACK (such as ftn, cc, and CC on Cray
HPC machines)
+# we used a placeholder for empty LAPACK_LIBRARIES to get through our logic
above.
+if (LAPACK_LIBRARIES STREQUAL
"LAPACK_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES")
+ set(LAPACK_LIBRARIES "")
+endif()
+
cmake_pop_check_state()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34a7e5ab587f5441ed5854b6ad9a159f3af88365
commit 34a7e5ab587f5441ed5854b6ad9a159f3af88365
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Fri Jun 14 11:39:28 2019 -0400
Commit: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
CommitDate: Fri Jun 14 11:39:28 2019 -0400
Tests/Tutorial: Fix version displayed in tutorial executable
diff --git a/Tests/Tutorial/Complete/tutorial.cxx
b/Tests/Tutorial/Complete/tutorial.cxx
index 443d195..4451cbd 100644
--- a/Tests/Tutorial/Complete/tutorial.cxx
+++ b/Tests/Tutorial/Complete/tutorial.cxx
@@ -10,7 +10,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/MultiPackage/tutorial.cxx
b/Tests/Tutorial/MultiPackage/tutorial.cxx
index 443d195..4451cbd 100644
--- a/Tests/Tutorial/MultiPackage/tutorial.cxx
+++ b/Tests/Tutorial/MultiPackage/tutorial.cxx
@@ -10,7 +10,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step10/tutorial.cxx
b/Tests/Tutorial/Step10/tutorial.cxx
index 443d195..4451cbd 100644
--- a/Tests/Tutorial/Step10/tutorial.cxx
+++ b/Tests/Tutorial/Step10/tutorial.cxx
@@ -10,7 +10,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step11/tutorial.cxx
b/Tests/Tutorial/Step11/tutorial.cxx
index 3768855..38d4a79 100644
--- a/Tests/Tutorial/Step11/tutorial.cxx
+++ b/Tests/Tutorial/Step11/tutorial.cxx
@@ -10,7 +10,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step2/tutorial.cxx
b/Tests/Tutorial/Step2/tutorial.cxx
index 75b7d67..5ba34e8 100644
--- a/Tests/Tutorial/Step2/tutorial.cxx
+++ b/Tests/Tutorial/Step2/tutorial.cxx
@@ -9,7 +9,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step3/tutorial.cxx
b/Tests/Tutorial/Step3/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step3/tutorial.cxx
+++ b/Tests/Tutorial/Step3/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step4/tutorial.cxx
b/Tests/Tutorial/Step4/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step4/tutorial.cxx
+++ b/Tests/Tutorial/Step4/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step5/tutorial.cxx
b/Tests/Tutorial/Step5/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step5/tutorial.cxx
+++ b/Tests/Tutorial/Step5/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step6/tutorial.cxx
b/Tests/Tutorial/Step6/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step6/tutorial.cxx
+++ b/Tests/Tutorial/Step6/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step7/tutorial.cxx
b/Tests/Tutorial/Step7/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step7/tutorial.cxx
+++ b/Tests/Tutorial/Step7/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step8/tutorial.cxx
b/Tests/Tutorial/Step8/tutorial.cxx
index 1d5742d..c2b89df 100644
--- a/Tests/Tutorial/Step8/tutorial.cxx
+++ b/Tests/Tutorial/Step8/tutorial.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
diff --git a/Tests/Tutorial/Step9/tutorial.cxx
b/Tests/Tutorial/Step9/tutorial.cxx
index 73e67a9..6c41859 100644
--- a/Tests/Tutorial/Step9/tutorial.cxx
+++ b/Tests/Tutorial/Step9/tutorial.cxx
@@ -14,7 +14,7 @@ int main(int argc, char* argv[])
{
if (argc < 2) {
std::cout << argv[0] << " Version " << Tutorial_VERSION_MAJOR << "."
- << Tutorial_VERSION_MAJOR << std::endl;
+ << Tutorial_VERSION_MINOR << std::endl;
std::cout << "Usage: " << argv[0] << " number" << std::endl;
return 1;
}
-----------------------------------------------------------------------
Summary of changes:
Help/variable/CMAKE_PROJECT_INCLUDE.rst | 9 ++++--
Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst | 9 ++++--
.../CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst | 10 +++++--
Modules/Compiler/GNU-CXX-FeatureTests.cmake | 4 +--
Modules/FindLAPACK.cmake | 22 ++++++++++----
Source/cmLinkLineComputer.cxx | 34 +++++++++++++++++-----
Tests/Tutorial/Complete/tutorial.cxx | 2 +-
Tests/Tutorial/MultiPackage/tutorial.cxx | 2 +-
Tests/Tutorial/Step10/tutorial.cxx | 2 +-
Tests/Tutorial/Step11/tutorial.cxx | 2 +-
Tests/Tutorial/Step2/tutorial.cxx | 2 +-
Tests/Tutorial/Step3/tutorial.cxx | 2 +-
Tests/Tutorial/Step4/tutorial.cxx | 2 +-
Tests/Tutorial/Step5/tutorial.cxx | 2 +-
Tests/Tutorial/Step6/tutorial.cxx | 2 +-
Tests/Tutorial/Step7/tutorial.cxx | 2 +-
Tests/Tutorial/Step8/tutorial.cxx | 2 +-
Tests/Tutorial/Step9/tutorial.cxx | 2 +-
18 files changed, 77 insertions(+), 35 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
