[Cmake-commits] CMake branch, next, updated. v3.6.1-1708-g5ae80fe
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, next has been updated via 5ae80febe60a0f15532ec439a742f30b5101f552 (commit) via b61a64b3018b4be126f459348773f58d21f72a23 (commit) from dea9826731fa7bc9c9b9cf58f64c9de2a64a22b3 (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=5ae80febe60a0f15532ec439a742f30b5101f552 commit 5ae80febe60a0f15532ec439a742f30b5101f552 Merge: dea9826 b61a64b Author: Daniel Pfeifer AuthorDate: Fri Sep 2 01:21:51 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 2 01:21:51 2016 -0400 Merge topic 'include-what-you-use' into next b61a64b3 fixup! fix a load of include-what-you-use violations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b61a64b3018b4be126f459348773f58d21f72a23 commit b61a64b3018b4be126f459348773f58d21f72a23 Author: Daniel Pfeifer AuthorDate: Fri Sep 2 07:21:29 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 2 07:21:29 2016 +0200 fixup! fix a load of include-what-you-use violations diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index a43e6c1..6fff984 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/Source/cmFilePathUuid.cxx b/Source/cmFilePathUuid.cxx index 6202d6d..b2def51 100644 --- a/Source/cmFilePathUuid.cxx +++ b/Source/cmFilePathUuid.cxx @@ -17,7 +17,6 @@ #include "cmMakefile.h" #include "cmSystemTools.h" -#include #include cmFilePathUuid::cmFilePathUuid(cmMakefile* makefile) --- Summary of changes: Source/cmELF.cxx |1 - Source/cmFilePathUuid.cxx |1 - 2 files changed, 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-831-gcb3e091
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 cb3e091a45bfdb24115ef68fa36341cf93419681 (commit) from 0c46750d2c4cee401f1cda047a71b0e349678077 (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=cb3e091a45bfdb24115ef68fa36341cf93419681 commit cb3e091a45bfdb24115ef68fa36341cf93419681 Author: Kitware Robot AuthorDate: Fri Sep 2 00:01:13 2016 -0400 Commit: Kitware Robot CommitDate: Fri Sep 2 00:01:13 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 23c2ce3..b8c7439 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 6) -set(CMake_VERSION_PATCH 20160901) +set(CMake_VERSION_PATCH 20160902) #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 http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1706-gdea9826
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, next has been updated via dea9826731fa7bc9c9b9cf58f64c9de2a64a22b3 (commit) via 655237678cf45b6e5f957b7eddb4576b72944747 (commit) from baaf49013308cac99f67e6430a0553213c31b922 (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=dea9826731fa7bc9c9b9cf58f64c9de2a64a22b3 commit dea9826731fa7bc9c9b9cf58f64c9de2a64a22b3 Merge: baaf490 6552376 Author: Daniel Pfeifer AuthorDate: Thu Sep 1 18:55:14 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 18:55:14 2016 -0400 Merge topic 'include-what-you-use' into next 65523767 fixup! fix a load of include-what-you-use violations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=655237678cf45b6e5f957b7eddb4576b72944747 commit 655237678cf45b6e5f957b7eddb4576b72944747 Author: Daniel Pfeifer AuthorDate: Fri Sep 2 00:54:07 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 2 00:54:07 2016 +0200 fixup! fix a load of include-what-you-use violations diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index 7fecc4d..6a2dfe8 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -11,6 +11,8 @@ */ #include "cmCommandArgumentParserHelper.h" +#include + #include "cmCommandArgumentLexer.h" #include "cmMakefile.h" #include "cmState.h" diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 920dd65..a43a7d1 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include --- Summary of changes: Source/cmCommandArgumentParserHelper.cxx |2 ++ Source/cmLocalGenerator.h|1 - 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1704-gbaaf490
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, next has been updated via baaf49013308cac99f67e6430a0553213c31b922 (commit) via 4aec72dd1907952bb874e0e7485a7b89a1ff6426 (commit) from 68be8cd53896acb0652261fef080155dc1a5248c (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=baaf49013308cac99f67e6430a0553213c31b922 commit baaf49013308cac99f67e6430a0553213c31b922 Merge: 68be8cd 4aec72d Author: Daniel Pfeifer AuthorDate: Thu Sep 1 18:17:47 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 18:17:47 2016 -0400 Merge topic 'include-what-you-use' into next 4aec72dd fixup! fix a load of include-what-you-use violations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4aec72dd1907952bb874e0e7485a7b89a1ff6426 commit 4aec72dd1907952bb874e0e7485a7b89a1ff6426 Author: Daniel Pfeifer AuthorDate: Fri Sep 2 00:16:58 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 2 00:16:58 2016 +0200 fixup! fix a load of include-what-you-use violations diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 277901d..c2e1d53 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -45,7 +45,6 @@ #include #include #include -#include #include void CMakeCommandUsage(const char* program) --- Summary of changes: Source/cmcmd.cxx |1 - 1 file changed, 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1702-g68be8cd
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, next has been updated
via 68be8cd53896acb0652261fef080155dc1a5248c (commit)
via af8e08dd4a1ce3a78ed604a9ffc1adca056ab125 (commit)
from e623fc98ca6bfeb4f4fda75b21542aefbcefd78b (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=68be8cd53896acb0652261fef080155dc1a5248c
commit 68be8cd53896acb0652261fef080155dc1a5248c
Merge: e623fc9 af8e08d
Author: Daniel Pfeifer
AuthorDate: Thu Sep 1 16:48:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 16:48:06 2016 -0400
Merge topic 'include-what-you-use' into next
af8e08dd fixup! fix a load of include-what-you-use violations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af8e08dd4a1ce3a78ed604a9ffc1adca056ab125
commit af8e08dd4a1ce3a78ed604a9ffc1adca056ab125
Author: Daniel Pfeifer
AuthorDate: Thu Sep 1 22:47:53 2016 +0200
Commit: Daniel Pfeifer
CommitDate: Thu Sep 1 22:47:53 2016 +0200
fixup! fix a load of include-what-you-use violations
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 9b3c899..25f9e3a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -39,12 +39,6 @@
#include
#endif
-#include
-#include
-#include
-#include
-#include
-
// only build kdevelop generator on non-windows platforms
// when not bootstrapping cmake
#if !defined(_WIN32)
@@ -97,8 +91,6 @@
#include "cmExtraKateGenerator.h"
#include "cmExtraSublimeTextGenerator.h"
-class cmCommand;
-
#ifdef CMAKE_USE_KDEVELOP
#include "cmGlobalKdevelopGenerator.h"
#endif
@@ -107,8 +99,6 @@ class cmCommand;
#include "cmExtraEclipseCDT4Generator.h"
#endif
-#include // required for atoi
-
#if defined(__APPLE__)
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmGlobalXCodeGenerator.h"
@@ -119,14 +109,23 @@ class cmCommand;
#include
#endif
+#include
// include sys/stat.h after sys/types.h
+#include // struct stat
+
#include
+#include
+#include
+#include
#include
#include
-#include // struct stat
-#include
+#include
+#include
+#include
#include
+class cmCommand;
+
namespace {
#if defined(CMAKE_BUILD_WITH_CMAKE)
---
Summary of changes:
Source/cmake.cxx | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1700-ge623fc9
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, next has been updated
via e623fc98ca6bfeb4f4fda75b21542aefbcefd78b (commit)
via 48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca (commit)
from 1ec2259fe60a0d147bd85ce171120a5bdafa6fbe (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=e623fc98ca6bfeb4f4fda75b21542aefbcefd78b
commit e623fc98ca6bfeb4f4fda75b21542aefbcefd78b
Merge: 1ec2259 48b32fa
Author: Bill Hoffman
AuthorDate: Thu Sep 1 16:34:37 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 16:34:37 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
48b32fae remove extra }}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca
commit 48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca
Author: Bill Hoffman
AuthorDate: Thu Sep 1 16:33:22 2016 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 1 16:33:22 2016 -0400
remove extra }}
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 4c787d7..a2289d5 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -795,7 +795,7 @@ function(matlab_add_unit_test)
"-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
"-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
"-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
-"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}}"
+"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
"-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
-P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
${${prefix}_TEST_ARGS}
---
Summary of changes:
Modules/FindMatlab.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1698-g1ec2259
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, next has been updated
via 1ec2259fe60a0d147bd85ce171120a5bdafa6fbe (commit)
via 62c369ab85c290d28165b6cd176f797e919688bd (commit)
from da6f1e440ef5804656ff085761233d6208bb613a (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=1ec2259fe60a0d147bd85ce171120a5bdafa6fbe
commit 1ec2259fe60a0d147bd85ce171120a5bdafa6fbe
Merge: da6f1e4 62c369a
Author: Brad King
AuthorDate: Thu Sep 1 15:57:56 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 15:57:56 2016 -0400
Merge topic 'include-what-you-use' into next
62c369ab fixup! fix a load of include-what-you-use violations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62c369ab85c290d28165b6cd176f797e919688bd
commit 62c369ab85c290d28165b6cd176f797e919688bd
Author: Brad King
AuthorDate: Thu Sep 1 15:57:49 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 15:57:49 2016 -0400
fixup! fix a load of include-what-you-use violations
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index ee3389c..5a8a5be 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -27,6 +27,8 @@
#include
#include
+#include "cmSystemTools.h" // IWYU pragma: keep
+
static const char* cmDocumentationName[][2] = { { 0,
" cmake-gui - CMake GUI." },
{ 0, 0 } };
---
Summary of changes:
Source/QtDialog/CMakeSetup.cxx |2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1696-gda6f1e4
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, next has been updated
via da6f1e440ef5804656ff085761233d6208bb613a (commit)
via 0bacb0f108a2e2b0670d5a17c031cb75b8d09428 (commit)
from 4db1df2da06cfa05b1f26546ca7deba40477b4e6 (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=da6f1e440ef5804656ff085761233d6208bb613a
commit da6f1e440ef5804656ff085761233d6208bb613a
Merge: 4db1df2 0bacb0f
Author: Brad King
AuthorDate: Thu Sep 1 15:56:30 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 15:56:30 2016 -0400
Merge topic 'include-what-you-use' into next
0bacb0f1 fixup! fix a load of include-what-you-use violations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bacb0f108a2e2b0670d5a17c031cb75b8d09428
commit 0bacb0f108a2e2b0670d5a17c031cb75b8d09428
Author: Brad King
AuthorDate: Thu Sep 1 15:55:49 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 15:55:49 2016 -0400
fixup! fix a load of include-what-you-use violations
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index 94d487e..eec773f 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -13,6 +13,12 @@
#include "cmThirdParty.h"
+#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) &&\
+ !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
+#define CMAKE_FIND_CAFILE
+#include "cmSystemTools.h"
+#endif
+
// curl versions before 7.21.5 did not provide this error code
#if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505
#define CURLE_NOT_BUILT_IN 4
@@ -32,8 +38,7 @@ std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile)
::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile);
check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
}
-#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) &&\
- !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
+#ifdef CMAKE_FIND_CAFILE
#define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt"
else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) {
::CURLcode res =
---
Summary of changes:
Source/cmCurl.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1694-g4db1df2
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, next has been updated
via 4db1df2da06cfa05b1f26546ca7deba40477b4e6 (commit)
via 0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534 (commit)
from 635a4f5a4fb965ab98cc60d068101ecb03d6b8d7 (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=4db1df2da06cfa05b1f26546ca7deba40477b4e6
commit 4db1df2da06cfa05b1f26546ca7deba40477b4e6
Merge: 635a4f5 0cbaaf2
Author: Brad King
AuthorDate: Thu Sep 1 15:36:39 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 15:36:39 2016 -0400
Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags' into next
0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534
commit 0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534
Author: Brad King
AuthorDate: Thu Sep 1 15:32:32 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 15:33:49 2016 -0400
GenerateExportHeader: Fix add_compiler_export_flags regression
The mechanical conversion in commit 5d0d980d (Use string(APPEND) in
Modules, 2016-07-28) accidentally introduced use of
string(APPEND ... PARENT_SCOPE)
Split that into the string(APPEND) and set(PARENT_SCOPE) pieces.
diff --git a/Modules/GenerateExportHeader.cmake
b/Modules/GenerateExportHeader.cmake
index 735a0d7..e33b927 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -415,6 +415,7 @@ function(add_compiler_export_flags)
if(ARGC GREATER 0)
set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
else()
-string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}" PARENT_SCOPE)
+string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
endif()
endfunction()
---
Summary of changes:
Modules/GenerateExportHeader.cmake |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1685-ge30f686
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, next has been updated
via e30f686be781bdd2925b9b072d1426e53d21494d (commit)
via 9fdc122bdbda2057f6b44c3122b3199e33ce8bc7 (commit)
from fc6661363956d97e4f726623f0b551bc4292cac5 (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=e30f686be781bdd2925b9b072d1426e53d21494d
commit e30f686be781bdd2925b9b072d1426e53d21494d
Merge: fc66613 9fdc122
Author: Brad King
AuthorDate: Thu Sep 1 15:06:41 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 15:06:41 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
9fdc122b fixup! Extend matlab_add_unit_test to run arbitrary code for the
test.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fdc122bdbda2057f6b44c3122b3199e33ce8bc7
commit 9fdc122bdbda2057f6b44c3122b3199e33ce8bc7
Author: Brad King
AuthorDate: Thu Sep 1 10:13:23 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 10:17:10 2016 -0400
fixup! Extend matlab_add_unit_test to run arbitrary code for the test.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index aaca953..4c787d7 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -784,29 +784,19 @@ function(matlab_add_unit_test)
message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
endif()
- # escape matlab commands so they can be passed to add_test
- # and to cmake -P script.
-
- string(REPLACE "\"" "" custom_test_cmd_clean
"${${prefix}_CUSTOM_TEST_COMMAND}")
- string(REPLACE ";" "\\;" custom_test_cmd_clean "${custom_test_cmd_clean}")
- string(REPLACE "\"" "" unittest_precmd_clean
"${${prefix}_UNITTEST_PRECOMMAND}")
- string(REPLACE ";" "\\;" unittest_precmd_clean "${unittest_precmd_clean}")
- string(REPLACE " " "\ " unittest_precmd_clean "${unittest_precmd_clean}")
- string(REPLACE ";" "\\;" additional_path_clean
"${${prefix}_ADDITIONAL_PATH}")
-
add_test(NAME ${${prefix}_NAME}
COMMAND ${CMAKE_COMMAND}
--Dtest_name=${${prefix}_NAME}
--Dadditional_paths=${additional_path_clean}
--Dtest_timeout=${${prefix}_TIMEOUT}
--Doutput_directory=${_matlab_temporary_folder}
--Dworking_directory=${${prefix}_WORKING_DIRECTORY}
--DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
--Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
-
-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
--Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
--Dcustom_Matlab_test_command=${custom_test_cmd_clean}
--Dcmd_to_run_before_test=${unittest_precmd_clean}
+"-Dtest_name=${${prefix}_NAME}"
+"-Dadditional_paths=${${prefix}_ADDITIONAL_PATH}}"
+"-Dtest_timeout=${${prefix}_TIMEOUT}"
+"-Doutput_directory=${_matlab_temporary_folder}"
+"-Dworking_directory=${${prefix}_WORKING_DIRECTORY}"
+"-DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}"
+"-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
+
"-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
+"-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
+"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}}"
+"-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
-P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
${${prefix}_TEST_ARGS}
${${prefix}_UNPARSED_ARGUMENTS}
diff --git a/Modules/MatlabTestsRedirect.cmake
b/Modules/MatlabTestsRedirect.cmake
index 5677ef6..1045be8 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -59,7 +59,7 @@ foreach(s IN LISTS additional_paths)
endforeach()
if(custom_Matlab_test_command)
- set(unittest_to_run ${custom_Matlab_test_command})
+ set(unittest_to_run "${custom_Matlab_test_command}")
else()
set(unittest_to_run "runtests('${unittest_file_to_run_name}'),
exit(max([ans(1,:).Failed]))")
endif()
@@ -70,7 +70,8 @@ if(no_unittest_framework)
endif()
set(Matlab_SCRIPT_TO_RUN
-"addpath(${concat_string}); ${cmd_to_run_before_test}; ${unittest_to_run}")
+"addpath(${concat_string}); ${cmd_to_run_before_test}; ${unittest_to_run}"
+ )
if(NOT working_directory)
set(working_directory "${output_directory}")
---
Summary of changes:
Modules/FindMatlab.cmake | 32 +++-
Modules/MatlabTestsRedirect.cmake |5 +++--
2 file
[Cmake-commits] CMake branch, next, updated. v3.6.1-1683-gfc66613
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, next has been updated
via fc6661363956d97e4f726623f0b551bc4292cac5 (commit)
via 9998774f2280999c559cdffe7473085c841c2d39 (commit)
from 24e158baed042535c40ec9d19edf7b5326269861 (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=fc6661363956d97e4f726623f0b551bc4292cac5
commit fc6661363956d97e4f726623f0b551bc4292cac5
Merge: 24e158b 9998774
Author: Brad King
AuthorDate: Thu Sep 1 14:53:16 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 14:53:16 2016 -0400
Merge topic 'vs14-debug-enum-older-toolsets' into next
9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9998774f2280999c559cdffe7473085c841c2d39
commit 9998774f2280999c559cdffe7473085c841c2d39
Author: Brad King
AuthorDate: Thu Sep 1 14:43:59 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 14:50:04 2016 -0400
VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
Closes: #16281
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 11dc28c..7e17818 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2357,7 +2357,9 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
static_cast(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset();
if (toolset &&
-(toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") ||
+(toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */
+ cmHasLiteralPrefix(toolset, "v80") ||
+ cmHasLiteralPrefix(toolset, "v90") ||
cmHasLiteralPrefix(toolset, "v100") ||
cmHasLiteralPrefix(toolset, "v110") ||
cmHasLiteralPrefix(toolset, "v120"))) {
---
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1681-g24e158b
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, next has been updated via 24e158baed042535c40ec9d19edf7b5326269861 (commit) via 24658dbbe973d747c9ca85471e5391fd830d3fcb (commit) from 3ebb968dbc9ddd3fbadde1f251aaf2c3165a4512 (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=24e158baed042535c40ec9d19edf7b5326269861 commit 24e158baed042535c40ec9d19edf7b5326269861 Merge: 3ebb968 24658db Author: Brad King AuthorDate: Thu Sep 1 11:23:27 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 11:23:27 2016 -0400 Merge topic 'autogen-base32' into next 24658dbb fixup! Add cmBase32Encoder class https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24658dbbe973d747c9ca85471e5391fd830d3fcb commit 24658dbbe973d747c9ca85471e5391fd830d3fcb Author: Brad King AuthorDate: Thu Sep 1 11:22:53 2016 -0400 Commit: Brad King CommitDate: Thu Sep 1 11:22:53 2016 -0400 fixup! Add cmBase32Encoder class diff --git a/Source/cmBase32.h b/Source/cmBase32.h index 38c955b..66ff8ba 100644 --- a/Source/cmBase32.h +++ b/Source/cmBase32.h @@ -14,6 +14,7 @@ #include // IWYU pragma: keep +#include #include /** \class cmBase32Encoder --- Summary of changes: Source/cmBase32.h |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1679-g3ebb968
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, next has been updated
via 3ebb968dbc9ddd3fbadde1f251aaf2c3165a4512 (commit)
via fee8fafd78db49852ee44a1d8eb0a441cd52ccd1 (commit)
via 3825a564930ffe09fd681632a905ab9c91c41d98 (commit)
from 53f189c917de7b6657524f08e18502f445693712 (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=3ebb968dbc9ddd3fbadde1f251aaf2c3165a4512
commit 3ebb968dbc9ddd3fbadde1f251aaf2c3165a4512
Merge: 53f189c fee8faf
Author: Brad King
AuthorDate: Thu Sep 1 11:18:55 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 11:18:55 2016 -0400
Merge topic 'libuv-scanbuild-fixes' into next
fee8fafd CTestCustom: Suppress scan-build warning in libuv
3825a564 libuv: Simplify variable initializations to satisfy Clang
scan-build
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fee8fafd78db49852ee44a1d8eb0a441cd52ccd1
commit fee8fafd78db49852ee44a1d8eb0a441cd52ccd1
Author: Brad King
AuthorDate: Thu Sep 1 11:14:19 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 11:16:30 2016 -0400
CTestCustom: Suppress scan-build warning in libuv
Clang scan-build warns in some expansions of RB_GENERATE_STATIC
that it has a "Dereference of null pointer". Simply suppress it
since this is third-party code anyway.
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index a39049b..4a540d2 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -82,6 +82,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"cm_sha2.*warning: Value stored to.*is never read"
"testProcess.*warning: Dereference of null pointer .loaded from variable
.invalidAddress.."
"liblzma/simple/x86.c:[0-9]+:[0-9]+: warning: The result of the '<<'
expression is undefined"
+ "libuv/src/.*:[0-9]+:[0-9]+: warning: Dereference of null pointer"
)
if(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3825a564930ffe09fd681632a905ab9c91c41d98
commit 3825a564930ffe09fd681632a905ab9c91c41d98
Author: Brad King
AuthorDate: Thu Sep 1 11:09:25 2016 -0400
Commit: Brad King
CommitDate: Thu Sep 1 11:10:18 2016 -0400
libuv: Simplify variable initializations to satisfy Clang scan-build
The Clang scan-build tool warns about assignments whose values are never
used, so initialize local variables at declaration instead.
diff --git a/Utilities/cmlibuv/src/unix/pipe.c
b/Utilities/cmlibuv/src/unix/pipe.c
index b73994c..80f5e6f 100644
--- a/Utilities/cmlibuv/src/unix/pipe.c
+++ b/Utilities/cmlibuv/src/unix/pipe.c
@@ -42,13 +42,10 @@ int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int
ipc) {
int uv_pipe_bind(uv_pipe_t* handle, const char* name) {
struct sockaddr_un saddr;
- const char* pipe_fname;
- int sockfd;
+ const char* pipe_fname = NULL;
+ int sockfd = -1;
int err;
- pipe_fname = NULL;
- sockfd = -1;
-
/* Already bound? */
if (uv__stream_fd(handle) >= 0)
return -EINVAL;
diff --git a/Utilities/cmlibuv/src/unix/tty.c b/Utilities/cmlibuv/src/unix/tty.c
index b2d37f4..ae1018f 100644
--- a/Utilities/cmlibuv/src/unix/tty.c
+++ b/Utilities/cmlibuv/src/unix/tty.c
@@ -58,8 +58,8 @@ static int uv__tty_is_slave(const int fd) {
int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, int fd, int readable) {
uv_handle_type type;
- int flags;
- int newfd;
+ int flags = 0;
+ int newfd = -1;
int r;
int saved_flags;
char path[256];
@@ -72,9 +72,6 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, int fd, int
readable) {
if (type == UV_FILE || type == UV_UNKNOWN_HANDLE)
return -EINVAL;
- flags = 0;
- newfd = -1;
-
/* Reopen the file descriptor when it refers to a tty. This lets us put the
* tty in non-blocking mode without affecting other processes that share it
* with us.
---
Summary of changes:
CTestCustom.cmake.in |1 +
Utilities/cmlibuv/src/unix/pipe.c |7 ++-
Utilities/cmlibuv/src/unix/tty.c |7 ++-
3 files changed, 5 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.1-1676-g53f189c
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, next has been updated
via 53f189c917de7b6657524f08e18502f445693712 (commit)
via 46de2f5b1cf1faa3bc18659b592306753c61f66c (commit)
via 67dba415e6f3a9d45d84c7790c4447625f917999 (commit)
from b93f03c8e15a8a2dde9cdfb9d239d304adbaee8d (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=53f189c917de7b6657524f08e18502f445693712
commit 53f189c917de7b6657524f08e18502f445693712
Merge: b93f03c 46de2f5
Author: Brad King
AuthorDate: Thu Sep 1 10:58:07 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 10:58:07 2016 -0400
Merge topic 'autogen-base32' into next
46de2f5b cmFilePathUuid: Use Base32 string instead of Base64 string
67dba415 Add cmBase32Encoder class
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46de2f5b1cf1faa3bc18659b592306753c61f66c
commit 46de2f5b1cf1faa3bc18659b592306753c61f66c
Author: Sebastian Holtermann
AuthorDate: Thu Sep 1 13:17:58 2016 +0200
Commit: Brad King
CommitDate: Thu Sep 1 10:51:15 2016 -0400
cmFilePathUuid: Use Base32 string instead of Base64 string
This produces files that will not collide on a case-insensitive
filesystem. It also avoids the need for special character
substitutions.
diff --git a/Source/cmFilePathUuid.cxx b/Source/cmFilePathUuid.cxx
index 2839b63..f99646c 100644
--- a/Source/cmFilePathUuid.cxx
+++ b/Source/cmFilePathUuid.cxx
@@ -12,10 +12,10 @@
#include "cmFilePathUuid.h"
+#include "cmBase32.h"
#include "cmCryptoHash.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
-#include "cmsys/Base64.h"
cmFilePathUuid::cmFilePathUuid(cmMakefile* makefile)
{
@@ -111,22 +111,16 @@ std::string cmFilePathUuid::GetChecksumString(
const std::string& sourceFilename, const std::string& sourceRelPath,
const std::string& sourceRelSeed)
{
- std::string checksumBase64;
+ std::string checksumBase32;
{
// Calculate the file ( seed + relative path + name ) checksum
std::vector hashBytes =
cmCryptoHash::New("SHA256")->ByteHashString(
(sourceRelSeed + sourceRelPath + sourceFilename).c_str());
-// Convert hash bytes to Base64 text string
-std::vector base64Bytes(hashBytes.size() * 2, 0);
-cmsysBase64_Encode(&hashBytes[0], hashBytes.size(), &base64Bytes[0], 0);
-checksumBase64 = reinterpret_cast(&base64Bytes[0]);
+
+checksumBase32 =
+ cmBase32Encoder().encodeString(&hashBytes[0], hashBytes.size(), false);
}
- // Base64 allows '/', '+' and '=' characters which are problematic
- // when used in file names. Replace them with safer alternatives.
- std::replace(checksumBase64.begin(), checksumBase64.end(), '/', '-');
- std::replace(checksumBase64.begin(), checksumBase64.end(), '+', '_');
- std::replace(checksumBase64.begin(), checksumBase64.end(), '=', '_');
- return checksumBase64;
+ return checksumBase32;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67dba415e6f3a9d45d84c7790c4447625f917999
commit 67dba415e6f3a9d45d84c7790c4447625f917999
Author: Sebastian Holtermann
AuthorDate: Thu Sep 1 13:08:18 2016 +0200
Commit: Brad King
CommitDate: Thu Sep 1 10:51:15 2016 -0400
Add cmBase32Encoder class
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8c74f60..6c3ebf5 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -166,6 +166,7 @@ endif()
#
set(SRCS
cmArchiveWrite.cxx
+ cmBase32.cxx
cmBootstrapCommands1.cxx
cmBootstrapCommands2.cxx
cmCacheManager.cxx
diff --git a/Source/cmBase32.cxx b/Source/cmBase32.cxx
new file mode 100644
index 000..ce5c99b
--- /dev/null
+++ b/Source/cmBase32.cxx
@@ -0,0 +1,108 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2016 Sebastian Holtermann
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+#include "cmBase32.h"
+
+// -- Static functions
+
+static const unsigned char Base32EncodeTable[33] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+inline unsigned char Base32EncodeChar(int schar)
+{
+ return Base32EncodeTable[schar];
+}
+
+void Base32Encode5(const unsigned char src[5], char dst[8])
+{
+ // [0]:5 bits
+ dst[0] = Base32EncodeChar((src[0] >> 3) & 0x1F);
+ // [0]:3 bits + [1]:2
[Cmake-commits] CMake branch, next, updated. v3.6.1-1673-gb93f03c
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, next has been updated via b93f03c8e15a8a2dde9cdfb9d239d304adbaee8d (commit) via 0c46750d2c4cee401f1cda047a71b0e349678077 (commit) via d7ca93f6194fa2b848945df630222b75b404b15a (commit) via 06b7789d4dfcfeedce6fa9a163e8f8d66b188c32 (commit) via d5bdcee737f428b09c6b390655e0ac485cd0b21a (commit) from d9fa27a6b1a4088095d8f20da8ca0542a857e989 (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=b93f03c8e15a8a2dde9cdfb9d239d304adbaee8d commit b93f03c8e15a8a2dde9cdfb9d239d304adbaee8d Merge: d9fa27a 0c46750 Author: Brad King AuthorDate: Thu Sep 1 10:40:05 2016 -0400 Commit: Brad King CommitDate: Thu Sep 1 10:40:05 2016 -0400 Merge branch 'master' into next --- 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 http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-830-g0c46750
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 0c46750d2c4cee401f1cda047a71b0e349678077 (commit) via fc695a776b5a4d61c3bfd3253ff9d40c3f30f6b9 (commit) from d7ca93f6194fa2b848945df630222b75b404b15a (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=0c46750d2c4cee401f1cda047a71b0e349678077 commit 0c46750d2c4cee401f1cda047a71b0e349678077 Merge: d7ca93f fc695a7 Author: Brad King AuthorDate: Thu Sep 1 10:39:43 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 10:39:43 2016 -0400 Merge topic 'FindEXPAT-use-PkgConfig' fc695a77 FindEXPAT: use hints from PkgConfig --- Summary of changes: Modules/FindEXPAT.cmake |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-825-g06b7789
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 06b7789d4dfcfeedce6fa9a163e8f8d66b188c32 (commit) via 3bd55dba7c889776bd094c6c29045c567b9000e2 (commit) from d5bdcee737f428b09c6b390655e0ac485cd0b21a (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=06b7789d4dfcfeedce6fa9a163e8f8d66b188c32 commit 06b7789d4dfcfeedce6fa9a163e8f8d66b188c32 Merge: d5bdcee 3bd55db Author: Brad King AuthorDate: Thu Sep 1 10:39:19 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 10:39:19 2016 -0400 Merge topic 'install-directory-genex-fix' 3bd55dba install: Fix evaluation of leading generator expressions in DIRECTORY --- Summary of changes: Source/cmInstallCommand.cxx|3 ++- Source/cmInstallDirectoryGenerator.cxx | 11 +++ 2 files changed, 13 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-828-gd7ca93f
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 d7ca93f6194fa2b848945df630222b75b404b15a (commit) via 900ee0b80077b38b81e5da47cd79c38f044c3a03 (commit) via 6442709bae306903084e0bd710b4cea41d0b2500 (commit) from 06b7789d4dfcfeedce6fa9a163e8f8d66b188c32 (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=d7ca93f6194fa2b848945df630222b75b404b15a commit d7ca93f6194fa2b848945df630222b75b404b15a Merge: 06b7789 900ee0b Author: Brad King AuthorDate: Thu Sep 1 10:39:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Sep 1 10:39:31 2016 -0400 Merge topic 'FindCUDA-fixes' 900ee0b8 FindCUDA: Allow cuda_compile* macros to be called more than once per directory 6442709b FindCUDA: Fix for broken cuda_compile* commands. --- Summary of changes: Modules/FindCUDA.cmake | 54 +++- 1 file changed, 44 insertions(+), 10 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
