[Cmake-commits] CMake branch, master, updated. v3.14.4-999-g8ada059
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 8ada05980f1a12a2673f78f4ea7bab9df6b9d987 (commit) from 94b2c757725b86a38b7934f9e1084debe6dbe2de (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=8ada05980f1a12a2673f78f4ea7bab9df6b9d987 commit 8ada05980f1a12a2673f78f4ea7bab9df6b9d987 Author: Kitware Robot AuthorDate: Sat May 18 00:01:11 2019 -0400 Commit: Kitware Robot CommitDate: Sat May 18 00:01:11 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index dc4f5fd..459f728 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190517) +set(CMake_VERSION_PATCH 20190518) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-998-g94b2c75
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 94b2c757725b86a38b7934f9e1084debe6dbe2de (commit)
via e1c95bc2788c0c71418a303306a66ff5bad7c938 (commit)
via 21f5ed80918507dc3a9dcd0b617ded901d6db74e (commit)
via 89ab54c11239f4832668ecca6a0b0b9edf112bd8 (commit)
via eda3963615e64f180e452b6e4bd1cce7f9fb14a9 (commit)
via 8c47be28cc2e5d45c53a089b681257c0b8387964 (commit)
via ac86c02d1b6da921c93d53fed85ad70ab05c4608 (commit)
via 2532e00339d34e36e90f78a28c3e4ce882f6fac0 (commit)
via 4edc0ef359578ddaa7db0163e3a6097e12530c9b (commit)
via 93ee7dd044dcebe99531169a0cfd96b3b0c5a2ef (commit)
via 4b4fd99f41e4178d914c41883ee12b63e9cb145a (commit)
from acc2f022bb538cbd61621f66d64d13b751d23f39 (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=94b2c757725b86a38b7934f9e1084debe6dbe2de
commit 94b2c757725b86a38b7934f9e1084debe6dbe2de
Merge: e1c95bc 89ab54c
Author: Brad King
AuthorDate: Fri May 17 13:38:50 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:39:48 2019 -0400
Merge topic 'findblas_mklroot_bla_vendor'
89ab54c112 FindBLAS: Choose MKL arch based on BLA_VENDOR
Acked-by: Kitware Robot
Merge-request: !3330
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1c95bc2788c0c71418a303306a66ff5bad7c938
commit e1c95bc2788c0c71418a303306a66ff5bad7c938
Merge: 21f5ed8 93ee7dd
Author: Brad King
AuthorDate: Fri May 17 13:37:35 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:38:44 2019 -0400
Merge topic 'autogen_ninja_clean'
93ee7dd044 Autogen: Update documentation for ADDITIONAL_CLEAN_FILES
4b4fd99f41 Autogen: Use ADDITIONAL_CLEAN_FILES target property for file
cleaning
Acked-by: Kitware Robot
Merge-request: !3327
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21f5ed80918507dc3a9dcd0b617ded901d6db74e
commit 21f5ed80918507dc3a9dcd0b617ded901d6db74e
Merge: acc2f02 eda3963
Author: Brad King
AuthorDate: Fri May 17 13:37:22 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:37:33 2019 -0400
Merge topic 'use_additional_clean_files'
eda3963615 UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaning
8c47be28cc UseJava: Use ADDITIONAL_CLEAN_FILES for cleaning
ac86c02d1b UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaning
2532e00339 FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaning
4edc0ef359 Test: Improve WarnUnusedCliUnused to run on all generators
Acked-by: Kitware Robot
Merge-request: !3328
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ab54c11239f4832668ecca6a0b0b9edf112bd8
commit 89ab54c11239f4832668ecca6a0b0b9edf112bd8
Author: Jakub Benda
AuthorDate: Thu May 16 09:00:21 2019 +0100
Commit: Jakub Benda
CommitDate: Thu May 16 10:35:37 2019 +0100
FindBLAS: Choose MKL arch based on BLA_VENDOR
Recently, FindBLAS has been extended with additional library search
path based on the environment variable MKLROOT. However, the choice
of the Intel MKL architecture (IA-32 vs Intel64) was based on
unrelated (and possibly undefined) size of integer.
This commit changes the selection of the Intel MKL architecture to
instead consider the variable BLA_VENDOR, if available.
So, if the environment variable MKLROOT is defined and
BLA_VENDOR=Intel10_32, then $ENV{MKLROOT}/lib/ia32_ will be added
to the search path (OS = lin, win, or mac).
Similarly, if MKLROOT is defined and BLA_VENDOR=Intel10_64lp or
BLA_VENDOR=Intel10_64ilp, then the path $ENV{MKLROOT}/intel64_
will be used.
If either MKLROOT or BLA_VENDOR is undefined, no additional search
path on top of LD_LIBRARY_PATH / DYLD_LIBRARY_PATH / LIB is be added.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 8d55ac7..65e5d1c 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -403,20 +403,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL
"All")
endif ()
if (DEFINED ENV{MKLROOT})
-set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}")
+if (BLA_VENDOR STREQUAL "Intel10_32")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/ia32")
+elseif (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR MATCHES
"^Intel10_64i?lp_seq$")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/intel64")
+endif ()
endif ()
if (_BLAS_MKLROOT_LIB_DIR)
-if( SIZEOF_INTEGER EQUAL 8 )
- set( _BLAS_MKL_PATH_PREFIX "intel64" )
-else()
- set(
[Cmake-commits] CMake branch, master, updated. v3.14.4-987-gacc2f02
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 acc2f022bb538cbd61621f66d64d13b751d23f39 (commit)
via 3020354f7c86f959d707aed2b833692204dd7778 (commit)
via 23e8364aedcbeb7ce606b6075c98827e52f0c7f6 (commit)
via e214abdaab4f8097095a601067b4071194ad01a5 (commit)
via f84ed796a220c6a4879f08e9003fe5489d8d104d (commit)
from 736f9d184da2109b009078e3184e996883bd7554 (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=acc2f022bb538cbd61621f66d64d13b751d23f39
commit acc2f022bb538cbd61621f66d64d13b751d23f39
Merge: 3020354 e214abd
Author: Brad King
AuthorDate: Fri May 17 13:26:38 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:27:12 2019 -0400
Merge topic 'offer_compiler_lang_generator_expression'
e214abdaab Genex: Add COMPILE_LANG_AND_ID generator expression
f84ed796a2 Docs: Generator-expressions remove usage of `CMake-id`
Acked-by: Kitware Robot
Merge-request: !3300
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3020354f7c86f959d707aed2b833692204dd7778
commit 3020354f7c86f959d707aed2b833692204dd7778
Merge: 736f9d1 23e8364
Author: Brad King
AuthorDate: Fri May 17 13:25:56 2019 +
Commit: Kitware Robot
CommitDate: Fri May 17 09:26:05 2019 -0400
Merge topic 'string-cleanup'
23e8364aed Source: std::string related cleanup
Acked-by: Kitware Robot
Acked-by: Sebastian Holtermann
Merge-request: !3324
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23e8364aedcbeb7ce606b6075c98827e52f0c7f6
commit 23e8364aedcbeb7ce606b6075c98827e52f0c7f6
Author: Vitaly Stakhovsky
AuthorDate: Tue May 14 09:16:11 2019 -0400
Commit: Brad King
CommitDate: Wed May 15 10:20:05 2019 -0400
Source: std::string related cleanup
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 2f62db1..f12ef0b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -122,8 +122,8 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
}
}
- const char* sourceDirectory = argv[2].c_str();
- const char* projectName = nullptr;
+ std::string sourceDirectory = argv[2];
+ std::string projectName;
std::string targetName;
std::vector cmakeFlags(1, "CMAKE_FLAGS"); // fake argv[0]
std::vector compileDefs;
@@ -309,7 +309,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
doing = DoingNone;
} else if (i == 3) {
this->SrcFileSignature = false;
- projectName = argv[i].c_str();
+ projectName = argv[i];
} else if (i == 4 && !this->SrcFileSignature) {
targetName = argv[i];
} else {
@@ -480,7 +480,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
// we need to create a directory and CMakeLists file etc...
// first create the directories
-sourceDirectory = this->BinaryDirectory.c_str();
+sourceDirectory = this->BinaryDirectory;
// now create a CMakeLists.txt file in that directory
FILE* fout = cmsys::SystemTools::Fopen(outFileName, "w");
@@ -950,7 +950,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector const& argv,
<< " '" << copyFile << "'\n";
/* clang-format on */
if (!this->FindErrorMessage.empty()) {
- emsg << this->FindErrorMessage.c_str();
+ emsg << this->FindErrorMessage;
}
if (copyFileError.empty()) {
this->Makefile->IssueMessage(MessageType::FATAL_ERROR, emsg.str());
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index 93ff8f4..c6e44e3 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -280,8 +280,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
xml.StartElement("Build");
- this->AppendTarget(xml, "all", nullptr, make.c_str(), lgs[0],
- compiler.c_str(), makeArgs);
+ this->AppendTarget(xml, "all", nullptr, make, lgs[0], compiler, makeArgs);
// add all executable and library targets and some of the GLOBAL
// and UTILITY targets
@@ -294,8 +293,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
// Only add the global targets from CMAKE_BINARY_DIR,
// not from the subdirs
if (lg->GetCurrentBinaryDirectory() == lg->GetBinaryDirectory()) {
-this->AppendTarget(xml, targetName, nullptr, make.c_str(), lg,
- compiler.c_str(), makeArgs);
+this->AppendTarget(xml, targetName, nullptr, make, lg, compiler,
+
