[Cmake-commits] CMake branch, master, updated. v3.9.0-419-gc2cc764
Kitware Robot
kwrobot at kitware.com
Fri Aug 4 09:25:03 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 c2cc7645820ba762bdaaba62fa860bd00b909a39 (commit)
via 0184531a6334075fdf572198a78065b9f494036d (commit)
via 51f08783c2982c55c86b0d2d04bfbbf81bfbc815 (commit)
via b745cb3e55298ab7d899e94ef2a89a59035874cb (commit)
via 70c326f0f1c0ecabc2f8079e2fe3e8205347682b (commit)
via 86a107cb5cfee1314bbb8caccfec894f12f6328a (commit)
via d7472bbf16485e895753c01cc16b576eab823c7e (commit)
via 75ca5f04df433cc5e34976ecae446c150ebfc214 (commit)
via e49c9eec276986756c084b05c473c1a8ce62bcd5 (commit)
via 168b42d2475abed82ded69940cf5fdca585226e8 (commit)
from c5c8ee1a9b7fd6af3b246f63ff27311358eea45a (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=c2cc7645820ba762bdaaba62fa860bd00b909a39
commit c2cc7645820ba762bdaaba62fa860bd00b909a39
Merge: 51f0878 0184531
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 4 13:24:22 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 4 09:24:25 2017 -0400
Merge topic 'FindCygwin-64-bit'
0184531a FindCygwin: Look for Cygwin in C:\Cygwin64.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1091
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0184531a6334075fdf572198a78065b9f494036d
commit 0184531a6334075fdf572198a78065b9f494036d
Author: Gerald Combs <gerald at wireshark.org>
AuthorDate: Mon Jul 31 09:41:47 2017 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 4 09:23:05 2017 -0400
FindCygwin: Look for Cygwin in C:\Cygwin64.
Add "C:\Cygwin64" to the list of Cygwin search paths.
diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake
index b2ed703..086c7dc 100644
--- a/Modules/FindCygwin.cmake
+++ b/Modules/FindCygwin.cmake
@@ -9,10 +9,12 @@
if (WIN32)
find_program(CYGWIN_INSTALL_PATH
- cygwin.bat
- "C:/Cygwin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]"
+ NAMES cygwin.bat
+ PATHS
+ "C:/Cygwin"
+ "C:/Cygwin64"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]"
)
get_filename_component(CYGWIN_INSTALL_PATH "${CYGWIN_INSTALL_PATH}" DIRECTORY)
mark_as_advanced(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51f08783c2982c55c86b0d2d04bfbbf81bfbc815
commit 51f08783c2982c55c86b0d2d04bfbbf81bfbc815
Merge: b745cb3 e49c9ee
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 4 13:17:19 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 4 09:17:24 2017 -0400
Merge topic 'genex-error-grammar'
e49c9eec cmGeneratorExpressionNode: add some missing commas
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1102
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b745cb3e55298ab7d899e94ef2a89a59035874cb
commit b745cb3e55298ab7d899e94ef2a89a59035874cb
Merge: 70c326f d7472bb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 4 13:16:42 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 4 09:16:46 2017 -0400
Merge topic 'file_WRITE_docs'
d7472bbf file: Clarify directory creation behavior when using WRITE
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1088
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70c326f0f1c0ecabc2f8079e2fe3e8205347682b
commit 70c326f0f1c0ecabc2f8079e2fe3e8205347682b
Merge: 86a107c 75ca5f0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 4 13:16:03 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 4 09:16:06 2017 -0400
Merge topic 'doc-file-GLOB-sorted'
75ca5f04 Help: Document that file(GLOB) result is sorted
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1098
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86a107cb5cfee1314bbb8caccfec894f12f6328a
commit 86a107cb5cfee1314bbb8caccfec894f12f6328a
Merge: c5c8ee1 168b42d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 4 13:15:10 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 4 09:15:14 2017 -0400
Merge topic 'set_IAR_excetion_option'
168b42d2 IAR: Enable extensions by default
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1081
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7472bbf16485e895753c01cc16b576eab823c7e
commit d7472bbf16485e895753c01cc16b576eab823c7e
Author: Robert Dailey <rcdailey at gmail.com>
AuthorDate: Fri Jul 28 10:48:45 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 3 14:11:26 2017 -0400
file: Clarify directory creation behavior when using WRITE
When using `file(WRITE)`, parent directories are also created. Documentation
has been updated to explain this behavior.
Co-Author: Craig Scott <craig.scott at crascit.com>
diff --git a/Help/command/file.rst b/Help/command/file.rst
index b2e4eea..e7a5d50 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -13,8 +13,11 @@ File manipulation command.
Write ``<content>`` into a file called ``<filename>``. If the file does
not exist, it will be created. If the file already exists, ``WRITE``
mode will overwrite it and ``APPEND`` mode will append to the end.
-(If the file is a build input, use the :command:`configure_file` command
-to update the file only when its content changes.)
+Any directories in the path specified by ``<filename>`` that do not
+exist will be created.
+
+If the file is a build input, use the :command:`configure_file` command
+to update the file only when its content changes.
------------------------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75ca5f04df433cc5e34976ecae446c150ebfc214
commit 75ca5f04df433cc5e34976ecae446c150ebfc214
Author: Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Thu Aug 3 15:41:13 2017 +0300
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 3 14:00:07 2017 -0400
Help: Document that file(GLOB) result is sorted
It has been sorted since commit v3.6.0-rc1~54^2 (file: Sort GLOB results
to make it deterministic, 2016-05-14). That commit left the order
unspecified in the documentation, but has been stable long enough to
document now.
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 97466ff..9cdce80 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -105,9 +105,7 @@ Generate a list of files that match the ``<globbing-expressions>`` and
store it into the ``<variable>``. Globbing expressions are similar to
regular expressions, but much simpler. If ``RELATIVE`` flag is
specified, the results will be returned as relative paths to the given
-path. No specific order of results is defined other than that it is
-deterministic. If order is important then sort the list explicitly
-(e.g. using the :command:`list(SORT)` command).
+path. The results will be ordered lexicographically.
By default ``GLOB`` lists directories - directories are omited in result if
``LIST_DIRECTORIES`` is set to false.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e49c9eec276986756c084b05c473c1a8ce62bcd5
commit e49c9eec276986756c084b05c473c1a8ce62bcd5
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Aug 3 13:29:33 2017 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Aug 3 13:39:58 2017 -0400
cmGeneratorExpressionNode: add some missing commas
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index a57d2a0..4d2e5c7 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -813,7 +813,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
reportError(
context, content->GetOriginalExpression(),
"$<COMPILE_LANGUAGE:...> may only be used to specify include "
- "directories compile definitions, compile options and to evaluate "
+ "directories, compile definitions, compile options, and to evaluate "
"components of the file(GENERATE) command.");
return std::string();
}
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
index 789b4d0..c8b124a 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:6 \(add_custom_command\
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
index 400fbc0..e8cefc7 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:4 \(add_custom_target\):
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
index e45bb02..7fa1f25 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_executable.cmake:4 \(add_executable\):
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
index c9ee6fe..ee60b58 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_library.cmake:4 \(add_library\):
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt
index 9955f5d..fd8a731 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-add_test.cmake:5 \(add_test\):
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt
index eca700f..bef7f63 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt
@@ -3,6 +3,6 @@ CMake Error:
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
index 2d324e2..687d9b7 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
@@ -3,8 +3,8 @@ CMake Error at COMPILE_LANGUAGE-target_sources.cmake:5 \(target_sources\):
\$<COMPILE_LANGUAGE>
- \$<COMPILE_LANGUAGE:...> may only be used to specify include directories
- compile definitions, compile options and to evaluate components of the
+ \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+ compile definitions, compile options, and to evaluate components of the
file\(GENERATE\) command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168b42d2475abed82ded69940cf5fdca585226e8
commit 168b42d2475abed82ded69940cf5fdca585226e8
Author: Norbert Lange <norbert.lange at andritz.com>
AuthorDate: Wed Jul 26 12:39:11 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 3 09:56:36 2017 -0400
IAR: Enable extensions by default
Set the variable added by commit a2112257 (Add infrastructure to use
language extensions without any standard, 2017-06-29) for IAR. This was
accidentally left out of commit d8e6cd9e (IAR: Improve support for IAR
ARM Compiler, 2017-06-15).
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake
index 48a9a16..55e019e 100644
--- a/Modules/Compiler/IAR-C.cmake
+++ b/Modules/Compiler/IAR-C.cmake
@@ -5,6 +5,9 @@ include(Compiler/CMakeCommonCompilerMacros)
# The toolchains for ARM and AVR are quite different:
if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
+
+ set(CMAKE_C_EXTENSION_COMPILE_OPTION -e)
+
set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
set(CMAKE_C90_EXTENSION_COMPILE_OPTION -e)
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake
index 7a6ba2b..8d86100 100644
--- a/Modules/Compiler/IAR-CXX.cmake
+++ b/Modules/Compiler/IAR-CXX.cmake
@@ -17,6 +17,8 @@ if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
endif()
endif()
+ set(CMAKE_CXX_EXTENSION_COMPILE_OPTION -e)
+
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -e)
-----------------------------------------------------------------------
Summary of changes:
Help/command/file.rst | 11 ++++++-----
Modules/Compiler/IAR-C.cmake | 3 +++
Modules/Compiler/IAR-CXX.cmake | 2 ++
Modules/FindCygwin.cmake | 10 ++++++----
Source/cmGeneratorExpressionNode.cxx | 2 +-
.../COMPILE_LANGUAGE-add_custom_command-stderr.txt | 4 ++--
.../COMPILE_LANGUAGE-add_custom_target-stderr.txt | 4 ++--
.../COMPILE_LANGUAGE-add_executable-stderr.txt | 4 ++--
.../COMPILE_LANGUAGE-add_library-stderr.txt | 4 ++--
.../COMPILE_LANGUAGE-add_test-stderr.txt | 4 ++--
.../GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt | 4 ++--
.../COMPILE_LANGUAGE-target_sources-stderr.txt | 4 ++--
12 files changed, 32 insertions(+), 24 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list