[Cmake-commits] CMake branch, next, updated. v3.7.2-2290-gca3a4fe
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 ca3a4fee2db8946a5ba46498959027a5cdf84b9a (commit) via 893423e9c9f4563dcd33e6472c8be85ec1aca88c (commit) via 7b4514fb33cf256ef165b2b28ba4affd1930a957 (commit) via 8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 (commit) via ae629a0dc9fa775230f4ce0157f13fde99381c9c (commit) from 69cd1ce190268342cc570569afbba1fc6038822e (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=ca3a4fee2db8946a5ba46498959027a5cdf84b9a commit ca3a4fee2db8946a5ba46498959027a5cdf84b9a Merge: 69cd1ce 893423e Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Jan 23 08:49:32 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jan 23 08:49:32 2017 -0500 Merge topic 'dl-libs-typo' into next 893423e9 CMAKE_DL_LIBS: fix typo 7b4514fb CMake Nightly Date Stamp 8ea12a8b CMake Nightly Date Stamp ae629a0d CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893423e9c9f4563dcd33e6472c8be85ec1aca88c commit 893423e9c9f4563dcd33e6472c8be85ec1aca88c Author: Thiago Perrotta <tperro...@tgr.net.br> AuthorDate: Fri Jan 20 23:35:27 2017 -0200 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Mon Jan 23 08:48:36 2017 -0500 CMAKE_DL_LIBS: fix typo diff --git a/Help/variable/CMAKE_DL_LIBS.rst b/Help/variable/CMAKE_DL_LIBS.rst index 1fe7641..50d313d 100644 --- a/Help/variable/CMAKE_DL_LIBS.rst +++ b/Help/variable/CMAKE_DL_LIBS.rst @@ -1,7 +1,7 @@ CMAKE_DL_LIBS - -Name of library containing ``dlopen`` and ``dlcose``. +Name of library containing ``dlopen`` and ``dlclose``. The name of the library that has ``dlopen`` and ``dlclose`` in it, usually ``-ldl`` on most UNIX machines. --- Summary of changes: Help/variable/CMAKE_DL_LIBS.rst |2 +- Source/CMakeVersion.cmake |2 +- 2 files changed, 2 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.7.2-2230-gcba760d
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 cba760da8de27c311918f2d33ff7f27193f6e6af (commit)
via 8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca (commit)
via fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c (commit)
from f38f5c7b2003bd0865d395e07f015d5d8c1580a7 (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=cba760da8de27c311918f2d33ff7f27193f6e6af
commit cba760da8de27c311918f2d33ff7f27193f6e6af
Merge: f38f5c7 8c1cfb9
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 18 12:30:50 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 18 12:30:50 2017 -0500
Merge topic 'add-dl-to-lua-static-linking' into next
8c1cfb94 Add dl library to Lua static library linking
fe8e00f6 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
commit 8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
Author: Michael Krasnyk <michael.kras...@gmail.com>
AuthorDate: Wed Jan 18 15:22:20 2017 +0100
Commit: Michael Krasnyk <michael.kras...@gmail.com>
CommitDate: Wed Jan 18 18:01:50 2017 +0100
Add dl library to Lua static library linking
diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index 5be0428..c777970 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -172,6 +172,13 @@ if (LUA_LIBRARY)
if (UNIX AND NOT APPLE AND NOT BEOS)
find_library(LUA_MATH_LIBRARY m)
set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+# include dl library for statically-linked Lua library
+get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+ list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+endif()
+
# For Windows and Mac, don't need to explicitly include the math library
else ()
set(LUA_LIBRARIES "${LUA_LIBRARY}")
---
Summary of changes:
Modules/FindLua.cmake |7 +++
Source/CMakeVersion.cmake |2 +-
2 files changed, 8 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.7.2-2227-gf38f5c7
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 f38f5c7b2003bd0865d395e07f015d5d8c1580a7 (commit)
via 7f0a21a51eb483c523a2c8880ce4e0466251ec74 (commit)
from 9d16616b45a62a9b398cff89d9801a7e9af264b0 (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=f38f5c7b2003bd0865d395e07f015d5d8c1580a7
commit f38f5c7b2003bd0865d395e07f015d5d8c1580a7
Merge: 9d16616 7f0a21a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 18 12:29:52 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 18 12:29:52 2017 -0500
Merge topic 'case-insensitive-bindir-detection' into next
7f0a21a5 cmSystemTools: use the actual case for root detection
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f0a21a51eb483c523a2c8880ce4e0466251ec74
commit 7f0a21a51eb483c523a2c8880ce4e0466251ec74
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 18 10:06:23 2017 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Jan 18 10:08:40 2017 -0500
cmSystemTools: use the actual case for root detection
On Windows, calling a binary installed with the default `bin` binary
directory will fail to be detected when called as `BIN\cmake.exe` due to
the string compare. Get the actual case of the path before checking that
the path ends with `CMAKE_BIN_DIR`.
Fixes #16574.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3d8fdf5..e693beb 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1979,7 +1979,8 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
// Install tree has
// - "/cmake"
// - ""
- if (cmHasSuffix(exe_dir, CMAKE_BIN_DIR)) {
+ const std::string actual_case = cmSystemTools::GetActualCaseForPath(exe_dir);
+ if (cmHasSuffix(actual_case, CMAKE_BIN_DIR)) {
std::string const prefix =
exe_dir.substr(0, exe_dir.size() - strlen(CMAKE_BIN_DIR));
cmSystemToolsCMakeRoot = prefix + CMAKE_DATA_DIR;
---
Summary of changes:
Source/cmSystemTools.cxx |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.7.1-1877-gd0868c9
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 d0868c9866d1bec94285c51bf2c6258e1c835223 (commit)
via 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab (commit)
from 040e28be7c196697a103e19725d1c9ef392d2471 (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=d0868c9866d1bec94285c51bf2c6258e1c835223
commit d0868c9866d1bec94285c51bf2c6258e1c835223
Merge: 040e28b 78c5db6
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 4 08:05:59 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 4 08:05:59 2017 -0500
Merge topic 'codeblocks-nmake-makefiles-jom' into next
78c5db6a Allow CodeBlocks for NMake Makefiles JOM
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
Author: Konstantin Podsvirov <konstan...@podsvirov.pro>
AuthorDate: Fri Dec 23 12:50:40 2016 +0300
Commit: Konstantin Podsvirov <konstan...@podsvirov.pro>
CommitDate: Fri Dec 23 12:50:40 2016 +0300
Allow CodeBlocks for NMake Makefiles JOM
diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index 01798c7..d03cb0c 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,6 +18,9 @@ This "extra" generator may be specified as:
``CodeBlocks - NMake Makefiles``
Generate with :generator:`NMake Makefiles`.
+``CodeBlocks - NMake Makefiles JOM``
+ Generate with :generator:`NMake Makefiles JOM`.
+
``CodeBlocks - Ninja``
Generate with :generator:`Ninja`.
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index 4c51af4..e42ce48 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,6 +46,9 @@ Generators
:variable:`CMAKE_CODELITE_USE_TARGETS` option
to change project creation from projects to targets.
+* The :generator:`CodeBlocks` now can generate with
+ :generator:`NMake Makefiles JOM`.
+
Commands
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index 18c732d..bc81a6a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,6 +49,7 @@ cmExtraCodeBlocksGenerator::GetFactory()
#if defined(_WIN32)
factory.AddSupportedGlobalGenerator("MinGW Makefiles");
factory.AddSupportedGlobalGenerator("NMake Makefiles");
+factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
// disable until somebody actually tests it:
// this->AddSupportedGlobalGenerator("MSYS Makefiles");
#endif
@@ -743,7 +744,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
}
std::string generator = this->GlobalGenerator->GetName();
- if (generator == "NMake Makefiles") {
+ if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
// For Windows ConvertToOutputPath already adds quotes when required.
// These need to be escaped, see
// https://gitlab.kitware.com/cmake/cmake/issues/13952
---
Summary of changes:
Help/generator/CodeBlocks.rst |3 +++
Help/release/3.7.rst |3 +++
Source/cmExtraCodeBlocksGenerator.cxx |3 ++-
3 files changed, 8 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.2-1993-gd3a223e
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 d3a223e4918e3c7eeba9ec2511309399f987cf7a (commit)
via 7845d2aaf7e4f2080892107a4d2e73d6a966ba6f (commit)
via 6a9ed3d4aeee576dd87af77fe51a781c5fe64b79 (commit)
from b129f20547e849650e9aee1b3b2b0a6835c748e2 (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=d3a223e4918e3c7eeba9ec2511309399f987cf7a
commit d3a223e4918e3c7eeba9ec2511309399f987cf7a
Merge: b129f20 7845d2a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Sep 13 15:09:05 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 13 15:09:05 2016 -0400
Merge topic 'detect-relink-incompat' into next
7845d2aa ninja: error out on relink requirements
6a9ed3d4 cmGeneratorTarget: factor out a space
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7845d2aaf7e4f2080892107a4d2e73d6a966ba6f
commit 7845d2aaf7e4f2080892107a4d2e73d6a966ba6f
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Sep 13 11:23:19 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Sep 13 13:53:26 2016 -0400
ninja: error out on relink requirements
Ninja does not support PRE_INSTALL_SCRIPT properties and does not
perform the relink required by installation without help from some other
mechanism, so error out if it would be required.
See #16304.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4f8c036..32dd150 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1162,7 +1162,23 @@ bool cmGeneratorTarget::NeedRelinkBeforeInstall(
// If either a build or install tree rpath is set then the rpath
// will likely change between the build tree and install tree and
// this target must be relinked.
- return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
+ bool have_rpath =
+this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
+ bool is_ninja =
+this->LocalGenerator->GetGlobalGenerator()->GetName() == "Ninja";
+
+ if (have_rpath && is_ninja) {
+std::ostringstream w;
+w << "Ninja does not support relinking before installation "
+ "on non-ELF platforms. This has been detected as a \""
+ << this->Makefile->GetDefinition("CMAKE_EXECUTABLE_FORMAT")
+ << "\" platform.";
+
+cmake* cm = this->LocalGenerator->GetCMakeInstance();
+cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
+ }
+
+ return have_rpath;
}
bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a9ed3d4aeee576dd87af77fe51a781c5fe64b79
commit 6a9ed3d4aeee576dd87af77fe51a781c5fe64b79
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Sep 13 11:22:42 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Sep 13 11:22:42 2016 -0400
cmGeneratorTarget: factor out a space
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7dd8e7f..4f8c036 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1280,11 +1280,11 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
if (!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) {
std::ostringstream w;
-w << "Attempting to use";
+w << "Attempting to use ";
if (macosx_rpath) {
- w << " MACOSX_RPATH";
+ w << "MACOSX_RPATH";
} else {
- w << " @rpath";
+ w << "@rpath";
}
w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
w << " This could be because you are using a Mac OS X version";
---
Summary of changes:
Source/cmGeneratorTarget.cxx | 24
1 file changed, 20 insertions(+), 4 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-1255-g7d693f7
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 7d693f72615cdef461fc3f22b5aefc7c5d6a93f1 (commit)
via 2bdba83e4bbd5435ee6faf5a2eedec4f0d0dfb0a (commit)
from a63f6c7ac7e406abe9c12a524bf3f11b1666f74f (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=7d693f72615cdef461fc3f22b5aefc7c5d6a93f1
commit 7d693f72615cdef461fc3f22b5aefc7c5d6a93f1
Merge: a63f6c7 2bdba83
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Aug 15 09:34:48 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 15 09:34:48 2016 -0400
Merge topic 'issue-tracker-urls' into next
2bdba83e issues: update references to the CMake issue tracker
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bdba83e4bbd5435ee6faf5a2eedec4f0d0dfb0a
commit 2bdba83e4bbd5435ee6faf5a2eedec4f0d0dfb0a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Fri Aug 12 15:06:35 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Mon Aug 15 09:34:06 2016 -0400
issues: update references to the CMake issue tracker
References to specific comments are left as-is since comments were not
migrated.
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 73d9fb3..c566f39 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -105,7 +105,7 @@ if(NOT CMAKE_C_COMPILER_ID_RUN)
CMAKE_C_COMPILER_ID_PLATFORM_CONTENT)
# The IAR compiler produces weird output.
- # See https://cmake.org/Bug/view.php?id=10176#c19598
+ # See https://gitlab.kitware.com/cmake/cmake/issues/10176#note_153591
list(APPEND CMAKE_C_COMPILER_ID_VENDORS IAR)
set(CMAKE_C_COMPILER_ID_VENDOR_FLAGS_IAR )
set(CMAKE_C_COMPILER_ID_VENDOR_REGEX_IAR "IAR .+ Compiler")
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index 063b68e..fb4155b 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -97,7 +97,7 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN)
CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT)
# The IAR compiler produces weird output.
- # See https://cmake.org/Bug/view.php?id=10176#c19598
+ # See https://gitlab.kitware.com/cmake/cmake/issues/10176#note_153591
list(APPEND CMAKE_CXX_COMPILER_ID_VENDORS IAR)
set(CMAKE_CXX_COMPILER_ID_VENDOR_FLAGS_IAR )
set(CMAKE_CXX_COMPILER_ID_VENDOR_REGEX_IAR "IAR .+ Compiler")
diff --git a/Modules/CMakeFindEclipseCDT4.cmake
b/Modules/CMakeFindEclipseCDT4.cmake
index 5bf738a..e158a73 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -35,7 +35,7 @@ function(_FIND_ECLIPSE_VERSION)
if(NOT DEFINED CMAKE_ECLIPSE_VERSION)
if(CMAKE_ECLIPSE_EXECUTABLE)
- # use REALPATH to resolve symlinks
(http://public.kitware.com/Bug/view.php?id=13036)
+ # use REALPATH to resolve symlinks
(https://gitlab.kitware.com/cmake/cmake/issues/13036)
get_filename_component(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE
"${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH)
get_filename_component(_ECLIPSE_DIR
"${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH)
file(GLOB _ECLIPSE_FEATURE_DIR
"${_ECLIPSE_DIR}/features/org.eclipse.platform*")
diff --git a/Modules/Compiler/IAR.cmake b/Modules/Compiler/IAR.cmake
index 8c6c3f6..8c45276 100644
--- a/Modules/Compiler/IAR.cmake
+++ b/Modules/Compiler/IAR.cmake
@@ -1,6 +1,6 @@
# This file is processed when the IAR compiler is used for a C or C++ file
# Documentation can be downloaded here:
http://www.iar.com/website1/1.0.1.0/675/1/
-# The initial feature request is here: https://cmake.org/Bug/view.php?id=10176
+# The initial feature request is here:
https://gitlab.kitware.com/cmake/cmake/issues/10176
# It also contains additional links and information.
if(_IAR_CMAKE_LOADED)
@@ -39,7 +39,8 @@ endif()
if(NOT IAR_TARGET_ARCHITECTURE)
message(FATAL_ERROR "The IAR compiler for this architecture is not yet
supported "
- " by CMake. Please go to https://cmake.org/Bug and enter a feature
request there.")
+ "by CMake. Please go to
https://gitlab.kitware.com/cmake/cmake/issues "
+ "and enter a feature request there.")
endif()
set(CMAKE_LINKER "${CMAKE_IAR_LINKER}" CACHE FILEPATH "The IAR linker" FORCE)
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index fc01976..e27eb72 100644
--- a/Modules/E
[Cmake-commits] CMake branch, next, updated. v3.6.1-1063-g55c3ee1
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 55c3ee103dcac6bc4659993deee069b53bcc008b (commit)
via 088f14eb725650158d256c28e86e44da3989ad9c (commit)
via 27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8 (commit)
via cc223e1eed69775a323a59628ad93fc79390c2f2 (commit)
from 57addbd3e72f7f16595ba2245a12da9eeac12535 (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=55c3ee103dcac6bc4659993deee069b53bcc008b
commit 55c3ee103dcac6bc4659993deee069b53bcc008b
Merge: 57addbd 088f14e
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Aug 2 15:13:46 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 2 15:13:46 2016 -0400
Merge topic 'intel-gnu11-support' into next
088f14eb Intel-C: standard flags are also supported in 12.0
27a3ca15 Intel-C: support gnu89 and gnu99 extension flags
cc223e1e Intel-C: declare support for gnu11
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=088f14eb725650158d256c28e86e44da3989ad9c
commit 088f14eb725650158d256c28e86e44da3989ad9c
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Aug 2 13:10:56 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Aug 2 13:10:56 2016 -0400
Intel-C: standard flags are also supported in 12.0
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 0efcbc2..edca154 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -19,7 +19,7 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
endif()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8
commit 27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Aug 2 13:10:30 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Aug 2 13:10:41 2016 -0400
Intel-C: support gnu89 and gnu99 extension flags
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index b2ff50d..0efcbc2 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -21,9 +21,9 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
- set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
- set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc223e1eed69775a323a59628ad93fc79390c2f2
commit cc223e1eed69775a323a59628ad93fc79390c2f2
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Aug 2 11:31:50 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Aug 2 11:42:45 2016 -0400
Intel-C: declare support for gnu11
Without extensions, functions like `strdup` are not available since they
are actually controlled by feature flags such as _SVID_SOURCE and
_BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are
set, so the functions are not declared properly leading to compile
errors.
Reported-by: Adam J. Stewart <ajstewart...@gmail.com>
Closes: #16226
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index eb9602a..b2ff50d 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -16,7 +16,7 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
- set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
+ set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
---
Summary of changes:
Modules/Compiler/Intel-C.cmake |8
1 file changed, 4 insertions(+), 4 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.0-819-g33aaf51
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 33aaf5180f12918392bd158c1c7278f4c83bc922 (commit) via 0b7c209610d1d24db3e8569b4fe8df98d138d6bb (commit) from 7650a137f25afc846e64a3ce9fd3da04a401a9ec (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=33aaf5180f12918392bd158c1c7278f4c83bc922 commit 33aaf5180f12918392bd158c1c7278f4c83bc922 Merge: 7650a13 0b7c209 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Wed Jul 13 09:49:15 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jul 13 09:49:15 2016 -0400 Merge topic 'geh-visibility-flag' into next 0b7c2096 GenerateExportHeader: always fill in _EXPORT macros https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b7c209610d1d24db3e8569b4fe8df98d138d6bb commit 0b7c209610d1d24db3e8569b4fe8df98d138d6bb Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Jul 11 14:52:05 2016 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Mon Jul 11 15:19:14 2016 -0400 GenerateExportHeader: always fill in _EXPORT macros The `_EXPORT` and `_NO_EXPORT` macros should always be made properly because the `_VISIBILITY_PRESET` properties are controlled independently of this module. One case where this breaks compatibility is where a project was setting `USE_COMPILER_HIDDEN_VISIBILITY=OFF` and then marking a symbol used outside of the library with `_NO_EXPORT` which is a contridiction. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 6389d30..1f67724 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -223,9 +223,6 @@ macro(_test_compiler_hidden_visibility) check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) -option(USE_COMPILER_HIDDEN_VISIBILITY - "Use HIDDEN visibility support if available." ON) -mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY) endif() endmacro() @@ -275,7 +272,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) if(WIN32 OR CYGWIN) set(DEFINE_EXPORT "__declspec(dllexport)") set(DEFINE_IMPORT "__declspec(dllimport)") -elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) +elseif(COMPILER_HAS_HIDDEN_VISIBILITY) set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))") set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))") set(DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))") @@ -388,6 +385,9 @@ function(add_compiler_export_flags) _test_compiler_hidden_visibility() _test_compiler_has_deprecated() + option(USE_COMPILER_HIDDEN_VISIBILITY +"Use HIDDEN visibility support if available." ON) + mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY) if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY)) # Just return if there are no flags to add. return() diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index 8b94ca7..875b0cf 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -124,10 +124,8 @@ if (WIN32 OR CYGWIN) else() set(_platform WinEmpty) endif() -elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) +elseif(COMPILER_HAS_HIDDEN_VISIBILITY) set(_platform UNIX) -elseif(COMPILER_HAS_DEPRECATED) - set(_platform UNIX_DeprecatedOnly) else() set(_platform Empty) endif() diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h b/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h deleted file mode 100644 index 808ff01..000 --- a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h +++ /dev/null @@ -1,42 +0,0 @@ - -#ifndef LIBSHARED_EXPORT_H -#define LIBSHARED_EXPORT_H - -#ifdef LIBSHARED_STATIC_DEFINE -# define LIBSHARED_EXPORT -# define LIBSHARED_NO_EXPORT -#else -# ifndef LIBSHARED_EXPORT -#ifdef libshared_EXPORTS -/* We are building this library */ -# define LIBSHARED_EXPORT -#else -/* We are using this library */ -# define LIBSHARED_EXPORT -#endif -# endif - -# ifndef LIBSHARED_NO_EXPORT -#define LIBSHARED_NO_EXPORT
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-298-gd42d169
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 d42d169fe452bbf41cd34a86ba169fc7407ec582 (commit) via 42fe7d215092dd1251a9ec298ca83a6ad9e59b86 (commit) from 91cb4389fb3baabbdd0b00d39ce794643b4bb006 (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=d42d169fe452bbf41cd34a86ba169fc7407ec582 commit d42d169fe452bbf41cd34a86ba169fc7407ec582 Merge: 91cb438 42fe7d2 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Jun 13 13:15:35 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jun 13 13:15:35 2016 -0400 Merge topic 'parent-scope-docs' into next 42fe7d21 Help: clarify PARENT_SCOPE behavior https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42fe7d215092dd1251a9ec298ca83a6ad9e59b86 commit 42fe7d215092dd1251a9ec298ca83a6ad9e59b86 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Jun 13 09:55:17 2016 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Mon Jun 13 09:55:17 2016 -0400 Help: clarify PARENT_SCOPE behavior Fixes #15093. diff --git a/Help/command/set.rst b/Help/command/set.rst index d04b880..b24ebef 100644 --- a/Help/command/set.rst +++ b/Help/command/set.rst @@ -25,7 +25,9 @@ If the ``PARENT_SCOPE`` option is given the variable will be set in the scope above the current scope. Each new directory or function creates a new scope. This command will set the value of a variable into the parent directory or calling function (whichever is applicable -to the case at hand). +to the case at hand). The previous state of the variable's value stays the +same in the current scope (e.g., if it was undefined before, it is still +undefined and if it had a value, it is still that value). Set Cache Entry ^^^ --- Summary of changes: Help/command/set.rst |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.0-rc1-296-g91cb438
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 91cb4389fb3baabbdd0b00d39ce794643b4bb006 (commit)
via 919db25c3b54f0303a19abb4a9e4f16056a3c1b6 (commit)
via ebf18df58083c90d4ba06ab896dfad8df9fe6ade (commit)
from ff55f7c75c495605547a97d3bac88ddaaa263a69 (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=91cb4389fb3baabbdd0b00d39ce794643b4bb006
commit 91cb4389fb3baabbdd0b00d39ce794643b4bb006
Merge: ff55f7c 919db25
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Jun 13 13:15:30 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 13 13:15:30 2016 -0400
Merge topic 'find_package-duplicate-search-paths' into next
919db25c cmFindPackageCommand: remove duplicate paths from error message
ebf18df5 cmFindPackageCommand: use iterators to loop over configurations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=919db25c3b54f0303a19abb4a9e4f16056a3c1b6
commit 919db25c3b54f0303a19abb4a9e4f16056a3c1b6
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Jun 13 11:10:59 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Mon Jun 13 11:16:12 2016 -0400
cmFindPackageCommand: remove duplicate paths from error message
Fixes #15252.
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4ab7a72..1945c44 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -664,6 +664,8 @@ bool cmFindPackageCommand::HandlePackageMode()
// If there are files in ConsideredConfigs, it means that FooConfig.cmake
// have been found, but they didn't have appropriate versions.
else if (!this->ConsideredConfigs.empty()) {
+ std::vector::const_iterator duplicate_end =
+cmRemoveDuplicates(this->ConsideredConfigs);
e << "Could not find a configuration file for package \"" << this->Name
<< "\" that "
<< (this->VersionExact ? "exactly matches" : "is compatible with")
@@ -672,7 +674,7 @@ bool cmFindPackageCommand::HandlePackageMode()
"accepted:\n";
for (std::vector::const_iterator i =
this->ConsideredConfigs.begin();
- i != this->ConsideredConfigs.end(); ++i) {
+ i != duplicate_end; ++i) {
e << " " << i->filename << ", version: " << i->version << "\n";
}
} else {
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index eff6b80..00db22b 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -159,6 +159,21 @@ private:
{
std::string filename;
std::string version;
+
+bool operator<(ConfigFileInfo const& rhs) const
+{
+ return this->filename < rhs.filename;
+}
+
+bool operator==(ConfigFileInfo const& rhs) const
+{
+ return this->filename == rhs.filename;
+}
+
+bool operator!=(ConfigFileInfo const& rhs) const
+{
+ return !(*this == rhs);
+}
};
std::vector ConsideredConfigs;
};
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebf18df58083c90d4ba06ab896dfad8df9fe6ade
commit ebf18df58083c90d4ba06ab896dfad8df9fe6ade
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Jun 13 11:09:05 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Mon Jun 13 11:16:10 2016 -0400
cmFindPackageCommand: use iterators to loop over configurations
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7908afe..4ab7a72 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -670,10 +670,10 @@ bool cmFindPackageCommand::HandlePackageMode()
<< " requested version \"" << this->Version << "\".\n"
<< "The following configuration files were considered but not "
"accepted:\n";
- for (std::vector::size_type i = 0;
- i < this->ConsideredConfigs.size(); i++) {
-e << " " << this->ConsideredConfigs[i].filename
- << ", version: " << this->ConsideredConfigs[i].version << "\n";
+ for (std::vector::const_iterator i =
+ this->ConsideredConfigs.begin();
+ i != this->ConsideredConfigs.
[Cmake-commits] CMake branch, next, updated. v3.5.1-783-g6aadc4a
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 6aadc4a25a07856a81262946b514884df95f795f (commit)
via 272779ce6aa4dbf15e2791ca3f3f5cbf1ce57b39 (commit)
from 5d94f12a78d259d4453913f345b882067cf45333 (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=6aadc4a25a07856a81262946b514884df95f795f
commit 6aadc4a25a07856a81262946b514884df95f795f
Merge: 5d94f12 272779c
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Fri Apr 1 13:17:39 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Apr 1 13:17:39 2016 -0400
Merge topic 'ep-tls-verify-git' into next
272779ce ExternalProject: Allow TLS_VERIFY for git clones
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=272779ce6aa4dbf15e2791ca3f3f5cbf1ce57b39
commit 272779ce6aa4dbf15e2791ca3f3f5cbf1ce57b39
Author: Samir Benmendil <m...@rmz.io>
AuthorDate: Fri Apr 1 11:49:16 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Fri Apr 1 11:49:16 2016 -0400
ExternalProject: Allow TLS_VERIFY for git clones
Use the git config `http.sslVerify=false` to disable strict ssl for git
commands.
diff --git a/Help/release/dev/ep-tls-verify-git.rst
b/Help/release/dev/ep-tls-verify-git.rst
new file mode 100644
index 000..3c727de
--- /dev/null
+++ b/Help/release/dev/ep-tls-verify-git.rst
@@ -0,0 +1,5 @@
+ep-tls-verify-git
+-
+
+* The :module:`ExternalProject` module now uses ``TLS_VERIFY`` when fetching
+ from git repositories.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 1185a81..8d8382f 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -499,7 +499,7 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED"
INHERITED
"ExternalProject module."
)
-function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE
git_repository git_tag git_remote_name git_submodules src_name work_dir
gitclone_infofile gitclone_stampfile)
+function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE
git_repository git_tag git_remote_name git_submodules src_name work_dir
gitclone_infofile gitclone_stampfile tls_verify)
file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -524,12 +524,18 @@ if(error_code)
message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
endif()
+set(git_options)
+if(NOT tls_verify)
+ list(APPEND git_options
+-c http.sslVerify=false)
+endif()
+
# try the clone 3 times incase there is an odd git clone issue
set(error_code 1)
set(number_of_tries 0)
while(error_code AND number_of_tries LESS 3)
execute_process(
-COMMAND \"${git_EXECUTABLE}\" clone --origin \"${git_remote_name}\"
\"${git_repository}\" \"${src_name}\"
+COMMAND \"${git_EXECUTABLE}\" \${git_options} clone --origin
\"${git_remote_name}\" \"${git_repository}\" \"${src_name}\"
WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code
)
@@ -544,7 +550,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" checkout ${git_tag}
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} checkout ${git_tag}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -553,7 +559,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" submodule init ${git_submodules}
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule init
${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -562,7 +568,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" submodule update --recursive ${git_submodules}
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive
${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -1777,6 +1783,11 @@ function(_ep_add_download_command name)
set(git_remote_name "origin")
endif()
+get_property(tls_verify TARGET ${name} PROPERTY _EP_TLS_VERIFY)
+if(NOT tls_verify)
+ set(tls_verify OFF)
+endif()
+
# For the download step, and the git clone operation, only the repository
# should be recorded in a
[Cmake-commits] CMake branch, next, updated. v3.5.1-766-gcf723c4
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 cf723c4cfbf1a71749c7b987a5348034703f91cc (commit) via af7c29f98c7fd569afcf8f37f76b1ff6cd23edb8 (commit) from 5b146672d69eb0fc001d468fb82699a89f73cf3c (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=cf723c4cfbf1a71749c7b987a5348034703f91cc commit cf723c4cfbf1a71749c7b987a5348034703f91cc Merge: 5b14667 af7c29f Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Fri Apr 1 10:04:51 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Apr 1 10:04:51 2016 -0400 Merge topic 'ctest-run-submodule-sync' into next af7c29f9 fixup! cmCTestGIT: add an option to initialize submodules on update https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af7c29f98c7fd569afcf8f37f76b1ff6cd23edb8 commit af7c29f98c7fd569afcf8f37f76b1ff6cd23edb8 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Fri Apr 1 10:03:47 2016 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Fri Apr 1 10:03:47 2016 -0400 fixup! cmCTestGIT: add an option to initialize submodules on update diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 2da8354..c2341c9 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -52,6 +52,7 @@ SVNUpdateOptions: @SVN_UPDATE_OPTIONS@ # Git options GITCommand: @GITCOMMAND@ +GITInitSubmodules: @GIT_INIT_SUBMODULES@ GITUpdateOptions: @GIT_UPDATE_OPTIONS@ GITUpdateCustom: @CTEST_GIT_UPDATE_CUSTOM@ --- Summary of changes: Modules/DartConfiguration.tcl.in |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.5.1-738-gb7c930d
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 b7c930d97a689cb5da1463d48672175ef5eda428 (commit) via 053b38ba96efb89e48d3236869a309a9eab9f292 (commit) from 9f46f7bd489b1c74084c2062c15a9de2e8770cdd (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=b7c930d97a689cb5da1463d48672175ef5eda428 commit b7c930d97a689cb5da1463d48672175ef5eda428 Merge: 9f46f7b 053b38b Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Mar 31 13:16:12 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Mar 31 13:16:12 2016 -0400 Merge topic 'ctest-run-submodule-sync' into next 053b38ba fixup! cmCTestGIT: add an option to initialize submodules on update https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=053b38ba96efb89e48d3236869a309a9eab9f292 commit 053b38ba96efb89e48d3236869a309a9eab9f292 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Mar 31 13:15:46 2016 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu Mar 31 13:15:46 2016 -0400 fixup! cmCTestGIT: add an option to initialize submodules on update diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 14ac5dd..3f73b32 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -408,7 +408,7 @@ Variables for CTest /variable/CTEST_EXTRA_COVERAGE_GLOB /variable/CTEST_GIT_COMMAND /variable/CTEST_GIT_INIT_SUBMODULES - /variable/CTEST_GIT_UPDATE_OPTIONS + /variable/CTEST_GIT_UPDATE_CUSTOM /variable/CTEST_GIT_UPDATE_OPTIONS /variable/CTEST_HG_COMMAND /variable/CTEST_HG_UPDATE_OPTIONS --- Summary of changes: Help/manual/cmake-variables.7.rst |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.5.1-734-g0d43a91
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 0d43a919fd720c76808fc9bcd617363ba97b41c5 (commit)
via 8b38bf19a03a09896cb5f7e74d14c250acb8e802 (commit)
via d737a1a41c67a6034ed215f123af641d95308c1c (commit)
via b6a8e686ba1f709fc85a6d9790027a6d93fcb41f (commit)
via c8faf5b06ec39fedcb24e8880819ed91b48c2a62 (commit)
via 779086283cea69d25076149c4f0bab0855978865 (commit)
from 35bc416eff0a51f23c6cea368fb2f70d49969b64 (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=0d43a919fd720c76808fc9bcd617363ba97b41c5
commit 0d43a919fd720c76808fc9bcd617363ba97b41c5
Merge: 35bc416 8b38bf1
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Thu Mar 31 12:35:59 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 31 12:35:59 2016 -0400
Merge topic 'ctest-run-submodule-sync' into next
8b38bf19 Help: add release notes for the branch
d737a1a4 cmCTestGIT: run `git submodule sync` before updating submodules
b6a8e686 cmCTestGIT: add an option to initialize submodules on update
c8faf5b0 cmCTestGIT: fix git version references
77908628 revert: revert back to the merge base
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b38bf19a03a09896cb5f7e74d14c250acb8e802
commit 8b38bf19a03a09896cb5f7e74d14c250acb8e802
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Thu Mar 31 12:31:56 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Thu Mar 31 12:35:26 2016 -0400
Help: add release notes for the branch
diff --git a/Help/release/dev/ctest-run-submodule-sync.rst
b/Help/release/dev/ctest-run-submodule-sync.rst
new file mode 100644
index 000..c41cc2f
--- /dev/null
+++ b/Help/release/dev/ctest-run-submodule-sync.rst
@@ -0,0 +1,9 @@
+ctest-run-submodule-sync
+
+
+* The :command:`ctest_update` command now looks at the
+ :variable:`CTEST_GIT_INIT_SUBMODULES` variable to determine whether
+ submodules should be updated or not before updating.
+* The :command:`ctest_update` command will now synchronize submodules on an
+ update. Updates which add submodules or change a submodule's URL will now be
+ pulled properly.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d737a1a41c67a6034ed215f123af641d95308c1c
commit d737a1a41c67a6034ed215f123af641d95308c1c
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Thu Mar 31 12:30:42 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Thu Mar 31 12:35:25 2016 -0400
cmCTestGIT: run `git submodule sync` before updating submodules
If the URL of a submodule changes upstream, the commits referenced at
the old URL may not be available and will cause an update failure.
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index c8e1394..38eadad 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -273,6 +273,7 @@ bool cmCTestGIT::UpdateImpl()
std::string top_dir = this->FindTopDir();
const char* git = this->CommandLineTool.c_str();
const char* recursive = "--recursive";
+ const char* sync_recursive = "--recursive";
// Git < 1.6.5 did not support submodule --recursive
if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
@@ -285,6 +286,17 @@ bool cmCTestGIT::UpdateImpl()
}
}
+ // Git < 1.8.1 did not support sync --recursive
+ if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
+{
+sync_recursive = 0;
+// No need to require >= 1.8.1 if there are no submodules.
+if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
+ {
+ this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
+ }
+}
+
OutputLogger submodule_out(this->Log, "submodule-out> ");
OutputLogger submodule_err(this->Log, "submodule-err> ");
@@ -304,6 +316,16 @@ bool cmCTestGIT::UpdateImpl()
}
}
+ char const* git_submodule_sync[] = {git, "submodule", "sync",
+ sync_recursive, 0};
+ ret = this->RunChild(git_submodule_sync, _out, _err,
+ top_dir.c_str());
+
+ if (!ret)
+{
+return false;
+}
+
char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
return this->RunChild(git_submodule, _out, _err,
top_dir.c_str());
https://cmake.org/gitweb?p=cma
[Cmake-commits] CMake branch, next, updated. v3.5.1-695-gc971f75
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 c971f751b482213ba817c4dcbffb5b2d96021120 (commit)
via 07b7614e07e351ea46c32eebfc1195d6f5a18a10 (commit)
from 46f442feed475ecaa2c43499f5bc0bbf00a60289 (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=c971f751b482213ba817c4dcbffb5b2d96021120
commit c971f751b482213ba817c4dcbffb5b2d96021120
Merge: 46f442f 07b7614
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:57:36 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 29 11:57:36 2016 -0400
Merge topic 'ctest-run-submodule-sync' into next
07b7614e fixup! cmCTestGIT: run git submodule {init,sync} to update
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07b7614e07e351ea46c32eebfc1195d6f5a18a10
commit 07b7614e07e351ea46c32eebfc1195d6f5a18a10
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:56:10 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Mar 29 11:56:10 2016 -0400
fixup! cmCTestGIT: run git submodule {init,sync} to update
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 4dd617f..ee462f8 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -273,15 +273,27 @@ bool cmCTestGIT::UpdateImpl()
std::string top_dir = this->FindTopDir();
const char* git = this->CommandLineTool.c_str();
const char* recursive = "--recursive";
+ const char* sync_recursive = "--recursive";
+
+ // Git < 1.6.5 did not support submodule --recursive
+ if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
+{
+recursive = 0;
+// No need to require >= 1.6.5 if there are no submodules.
+if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
+ {
+ this->Log << "Git < 1.6.5 cannot update submodules recursively\n";
+ }
+}
// Git < 1.8.1 did not support sync --recursive
if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
{
-recursive = 0;
+sync_recursive = 0;
// No need to require >= 1.8.1 if there are no submodules.
if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
{
- this->Log << "Git < 1.8.1 cannot update submodules recursively\n";
+ this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
}
}
@@ -297,7 +309,8 @@ bool cmCTestGIT::UpdateImpl()
return false;
}
- char const* git_submodule_sync[] = {git, "submodule", "sync", recursive, 0};
+ char const* git_submodule_sync[] = {git, "submodule", "sync",
+ sync_recursive, 0};
ret = this->RunChild(git_submodule_sync, _out, _err,
top_dir.c_str());
---
Summary of changes:
Source/CTest/cmCTestGIT.cxx | 19 ---
1 file changed, 16 insertions(+), 3 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.5.1-693-g46f442f
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 46f442feed475ecaa2c43499f5bc0bbf00a60289 (commit)
via 4fb6148000219c6a08c1d60ac6cb30febc2b80b2 (commit)
from aaf515c3532a68f33df3fc274b199c35d52205d1 (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=46f442feed475ecaa2c43499f5bc0bbf00a60289
commit 46f442feed475ecaa2c43499f5bc0bbf00a60289
Merge: aaf515c 4fb6148
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:50:15 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 29 11:50:15 2016 -0400
Merge topic 'external-project-no-extract' into next
4fb61480 fixup! ExternalProject: add support for just downloading a file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb6148000219c6a08c1d60ac6cb30febc2b80b2
commit 4fb6148000219c6a08c1d60ac6cb30febc2b80b2
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:49:54 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Mar 29 11:49:54 2016 -0400
fixup! ExternalProject: add support for just downloading a file
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f2f005b..0c4d9d8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -77,7 +77,7 @@ Create custom targets to build projects in external trees
Path to a certificate authority file
``TIMEOUT ``
Time allowed for file download operations
- ``NO_EXTRACT 1``
+ ``DOWNLOAD_NO_EXTRACT 1``
Just download the file and do not extract it; the full path to the
downloaded file is available as .
@@ -1878,7 +1878,7 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -E remove_directory ${source_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
else()
- get_property(no_extract TARGET "${name}" PROPERTY _EP_NO_EXTRACT SET)
+ get_property(no_extract TARGET "${name}" PROPERTY
_EP_DOWNLOAD_NO_EXTRACT SET)
if("${url}" MATCHES "^[a-z]+://")
# TODO: Should download and extraction be different steps?
if("x${fname}" STREQUAL "x")
---
Summary of changes:
Modules/ExternalProject.cmake |4 ++--
1 file changed, 2 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.5.1-691-gaaf515c
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 aaf515c3532a68f33df3fc274b199c35d52205d1 (commit)
via 1aa1a6a0e467b309ab3c93f11b99207cdf5d0924 (commit)
from 641bc68e9a1e79d7df654f5768223238da9c820b (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=aaf515c3532a68f33df3fc274b199c35d52205d1
commit aaf515c3532a68f33df3fc274b199c35d52205d1
Merge: 641bc68 1aa1a6a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:29:00 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 29 11:29:00 2016 -0400
Merge topic 'ctest-run-submodule-sync' into next
1aa1a6a0 cmCTestGIT: run git submodule {init,sync} to update
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1aa1a6a0e467b309ab3c93f11b99207cdf5d0924
commit 1aa1a6a0e467b309ab3c93f11b99207cdf5d0924
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 11:05:15 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Mar 29 11:27:27 2016 -0400
cmCTestGIT: run git submodule {init,sync} to update
Repositories which add submodules or change their URLs are not fixed by
CTest when updating a git repository.
diff --git a/Help/release/dev/ctest-run-submodule-sync.rst
b/Help/release/dev/ctest-run-submodule-sync.rst
new file mode 100644
index 000..55e87c0
--- /dev/null
+++ b/Help/release/dev/ctest-run-submodule-sync.rst
@@ -0,0 +1,6 @@
+ctest-run-submodule-sync
+
+
+* The :command:`ctest_update` command will now initialize and synchronize
+ submodules on an update. Updates which add submodules or change a
+ submodule's URL will now be pulled properly.
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index bbb3b9d..4dd617f 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -274,20 +274,39 @@ bool cmCTestGIT::UpdateImpl()
const char* git = this->CommandLineTool.c_str();
const char* recursive = "--recursive";
- // Git < 1.6.5.0 did not support --recursive
- if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
+ // Git < 1.8.1 did not support sync --recursive
+ if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
{
recursive = 0;
-// No need to require >= 1.6.5.0 if there are no submodules.
+// No need to require >= 1.8.1 if there are no submodules.
if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
{
- this->Log << "Git < 1.6.5.0 cannot update submodules recursively\n";
+ this->Log << "Git < 1.8.1 cannot update submodules recursively\n";
}
}
- char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
OutputLogger submodule_out(this->Log, "submodule-out> ");
OutputLogger submodule_err(this->Log, "submodule-err> ");
+
+ char const* git_submodule_init[] = {git, "submodule", "init", 0};
+ bool ret = this->RunChild(git_submodule_init, _out, _err,
+top_dir.c_str());
+
+ if (!ret)
+{
+return false;
+}
+
+ char const* git_submodule_sync[] = {git, "submodule", "sync", recursive, 0};
+ ret = this->RunChild(git_submodule_sync, _out, _err,
+ top_dir.c_str());
+
+ if (!ret)
+{
+return false;
+}
+
+ char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
return this->RunChild(git_submodule, _out, _err,
top_dir.c_str());
}
---
Summary of changes:
Help/release/dev/ctest-run-submodule-sync.rst |6 +
Source/CTest/cmCTestGIT.cxx | 29 -
2 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 Help/release/dev/ctest-run-submodule-sync.rst
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.5.1-687-g83a4aec
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 83a4aec25e404a2975fcc06bf181ec1bf4941bd2 (commit)
via d5a5af252e1280e62bc3ec146d2baabc0f2e18d5 (commit)
from a2d1f4c6d990cecc9ce724758eabdb0e77d1e7a8 (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=83a4aec25e404a2975fcc06bf181ec1bf4941bd2
commit 83a4aec25e404a2975fcc06bf181ec1bf4941bd2
Merge: a2d1f4c d5a5af2
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 10:28:30 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 29 10:28:30 2016 -0400
Merge topic 'external-project-no-extract' into next
d5a5af25 ExternalProject: add support for just downloading a file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5a5af252e1280e62bc3ec146d2baabc0f2e18d5
commit d5a5af252e1280e62bc3ec146d2baabc0f2e18d5
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Mar 29 10:25:01 2016 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Mar 29 10:25:01 2016 -0400
ExternalProject: add support for just downloading a file
Some projects only ship self-extracting installers rather than
compressed archives. Add a flag so that these files may be used in
ExternalProject.
diff --git a/Help/release/dev/external-project-no-extract.rst
b/Help/release/dev/external-project-no-extract.rst
new file mode 100644
index 000..af5d717
--- /dev/null
+++ b/Help/release/dev/external-project-no-extract.rst
@@ -0,0 +1,6 @@
+external-project-no-extract
+---
+
+* The :module:`ExternalProject` module leared the ``NO_EXTRACT 1`` argument to
+ skip extracting the file that is downloaded (e.g., for self-extracting shell
+ installers or MSI files).
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 249658d..f2f005b 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -77,6 +77,9 @@ Create custom targets to build projects in external trees
Path to a certificate authority file
``TIMEOUT ``
Time allowed for file download operations
+ ``NO_EXTRACT 1``
+Just download the file and do not extract it; the full path to the
+downloaded file is available as .
Update/Patch step options are:
@@ -1107,7 +1110,7 @@ macro(_ep_replace_location_tags target_name)
set(vars ${ARGN})
foreach(var ${vars})
if(${var})
- foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR)
+ foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOADED_FILE)
get_property(val TARGET ${target_name} PROPERTY _EP_${dir})
string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}")
endforeach()
@@ -1875,6 +1878,7 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -E remove_directory ${source_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
else()
+ get_property(no_extract TARGET "${name}" PROPERTY _EP_NO_EXTRACT SET)
if("${url}" MATCHES "^[a-z]+://")
# TODO: Should download and extraction be different steps?
if("x${fname}" STREQUAL "x")
@@ -1884,7 +1888,9 @@ function(_ep_add_download_command name)
string(REGEX MATCH
"([^/\\?]+(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip))/.*$"
match_result "${url}")
set(fname "${CMAKE_MATCH_1}")
endif()
-if(NOT "${fname}" MATCHES
"(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
+if (no_extract)
+ get_filename_component(fname "${url}" NAME)
+elseif(NOT "${fname}" MATCHES
"(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
message(FATAL_ERROR "Could not extract tarball filename from url:\n
${url}")
endif()
string(REPLACE ";" "-" fname "${fname}")
@@ -1898,16 +1904,30 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -P "${download_script}"
COMMAND)
set(retries 3)
-set(comment "Performing download step (download, verify and extract)
for '${name}'")
+if (no_extract)
+ set(steps "download and verify")
+else ()
+ set(steps "download, verify and extract")
+endif ()
+set(comment "Performing download step
[Cmake-commits] CMake branch, next, updated. v3.4.2-2065-g1ca1451
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 1ca14513c5df74ec3d4d5b9febbe1627a6a46cb9 (commit)
via 40249bccdf9c66453433da3608da9cc89cbee675 (commit)
from 38022559e9947adb274890070499c69738d0deaf (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=1ca14513c5df74ec3d4d5b9febbe1627a6a46cb9
commit 1ca14513c5df74ec3d4d5b9febbe1627a6a46cb9
Merge: 3802255 40249bc
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Thu Jan 21 10:39:27 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 21 10:39:27 2016 -0500
Merge topic 'fix-pkg_search_module-cache' into next
40249bcc FindPkgConfig: set standard variables in the cache
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40249bccdf9c66453433da3608da9cc89cbee675
commit 40249bccdf9c66453433da3608da9cc89cbee675
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 20 14:38:05 2016 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Thu Jan 21 10:38:30 2016 -0500
FindPkgConfig: set standard variables in the cache
Fixes a regression introduced when the code was simplified to use the
variable queries.
Fixes #15903.
Reported-by: Bernd Lörwald
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 177e7b8..4f50e38 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -382,6 +382,9 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
pkg_get_variable("${_pkg_check_prefix}_PREFIX"
${_pkg_check_modules_pkg} "prefix")
pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR"
${_pkg_check_modules_pkg} "includedir")
pkg_get_variable("${_pkg_check_prefix}_LIBDIR"
${_pkg_check_modules_pkg} "libdir")
+foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
+ _pkgconfig_set("${_pkg_check_modules_pkg}_${variable}"
"${${_pkg_check_modules_pkg}_${variable}}")
+endforeach ()
if (NOT ${_is_silent})
message(STATUS " Found ${_pkg_check_modules_pkg}, version
${_pkgconfig_VERSION}")
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_cache_variables.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_cache_variables.cmake
new file mode 100644
index 000..8d8d000
--- /dev/null
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_cache_variables.cmake
@@ -0,0 +1,16 @@
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(NCURSES QUIET ncurses)
+
+if (NCURSES_FOUND)
+ foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
+get_property("${variable}"
+ CACHE "NCURSES_${variable}"
+ PROPERTY TYPE
+ SET)
+if (NOT ${variable})
+ message(FATAL_ERROR "Failed to set cache entry for NCURSES_${variable}")
+endif ()
+ endforeach ()
+else ()
+ message(STATUS "skipping test; ncurses not found")
+endif ()
diff --git a/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake
b/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake
index bb04aa2..24089e0 100644
--- a/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake
@@ -14,4 +14,5 @@ endif()
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
run_cmake(FindPkgConfig_GET_VARIABLE)
+ run_cmake(FindPkgConfig_cache_variables)
endif ()
---
Summary of changes:
Modules/FindPkgConfig.cmake|3 +++
.../FindPkgConfig/FindPkgConfig_cache_variables.cmake | 16
Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake|1 +
3 files changed, 20 insertions(+)
create mode 100644
Tests/RunCMake/FindPkgConfig/FindPkgConfig_cache_variables.cmake
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.3.2-3170-gf7b8e9f
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 f7b8e9fc7446ba57138811776dac5a06acfd3f06 (commit) via 1d7e2081cd4adc0e1dc35c50d3fcd7cc785d4816 (commit) from f7b4f40af838f66acbef763f215d697dd12cdff6 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7b8e9fc7446ba57138811776dac5a06acfd3f06 commit f7b8e9fc7446ba57138811776dac5a06acfd3f06 Merge: f7b4f40 1d7e208 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Sep 21 11:53:03 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Sep 21 11:53:03 2015 -0400 Merge topic 'ctest-variable-docs' into next 1d7e2081 fixup! Help: document CTEST_CUSTOM_* variables http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d7e2081cd4adc0e1dc35c50d3fcd7cc785d4816 commit 1d7e2081cd4adc0e1dc35c50d3fcd7cc785d4816 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Sep 21 11:34:31 2015 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Mon Sep 21 11:50:41 2015 -0400 fixup! Help: document CTEST_CUSTOM_* variables diff --git a/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst index 946114c..d5893c9 100644 --- a/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst +++ b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst @@ -4,5 +4,4 @@ CTEST_CUSTOM_COVERAGE_EXCLUDE A list of regular expressions which will be used to exclude files by their path from coverage output by the :command:`ctest_coverage` command. -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_COVERAGE_EXCLUDE .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst index cfb1093..cd65ae3 100644 --- a/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst +++ b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst @@ -4,5 +4,4 @@ CTEST_CUSTOM_ERROR_EXCEPTION A list of regular expressions which will be used to exclude when detecting error messages in build outputs by the :command:`ctest_test` command. -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_EXCEPTION .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst index dbb9c19..558f5e5 100644 --- a/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst +++ b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst @@ -4,5 +4,4 @@ CTEST_CUSTOM_ERROR_MATCH A list of regular expressions which will be used to detect error messages in build outputs by the :command:`ctest_test` command. -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_MATCH .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst b/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst index f4ee2e8..614859b 100644 --- a/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst +++ b/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst @@ -4,5 +4,4 @@ CTEST_CUSTOM_ERROR_POST_CONTEXT The number of lines to include as context which follow an error message by the :command:`ctest_test` command. The default is 10. -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_POST_CONTEXT .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst b/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst index b1b3e0d..74dc47a 100644 --- a/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst +++ b/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst @@ -4,5 +4,4 @@ CTEST_CUSTOM_ERROR_PRE_CONTEXT The number of lines to include as context which precede an error message by the :command:`ctest_test` command. The default is 10. -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_PRE_CONTEXT .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst b/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst index 524be5d..5aeae88 100644 --- a/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst +++ b/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst @@ -5,5 +5,4 @@ When saving a failing test's output, this is the maximum size, in bytes, that will be collected by the :command:`ctest_test` command. Defaults to 307200 (300 KiB). -.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE .. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst b/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst index 3213d34..920cb04 100644 --- a/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER
[Cmake-commits] CMake branch, next, updated. v3.3.2-3080-g244bb3c
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 244bb3caa32a08d6719f0f3f1b63509e5373372f (commit)
via 70e8db6e20749a484dd677d7094780c5f4b451c6 (commit)
via 7f7f1eecfd6834b8a499f0fde49469a10a1b2905 (commit)
from 53a6318c7a9afa8de467665f6c78e18ce6c3b43d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=244bb3caa32a08d6719f0f3f1b63509e5373372f
commit 244bb3caa32a08d6719f0f3f1b63509e5373372f
Merge: 53a6318 70e8db6
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Fri Sep 18 13:20:34 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 18 13:20:34 2015 -0400
Merge topic 'pkg-config-variable-function' into next
70e8db6e FindPkgConfig: add a command to query arbitrary variables
7f7f1eec FindPkgConfig: use execute_process to strip trailing whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70e8db6e20749a484dd677d7094780c5f4b451c6
commit 70e8db6e20749a484dd677d7094780c5f4b451c6
Author: Ben Boeckel <maths...@gmail.com>
AuthorDate: Thu Sep 17 21:05:29 2015 -0400
Commit: Ben Boeckel <maths...@gmail.com>
CommitDate: Thu Sep 17 21:08:19 2015 -0400
FindPkgConfig: add a command to query arbitrary variables
diff --git a/Help/release/dev/pkg-config-variable-function.rst
b/Help/release/dev/pkg-config-variable-function.rst
new file mode 100644
index 000..e181d13
--- /dev/null
+++ b/Help/release/dev/pkg-config-variable-function.rst
@@ -0,0 +1,6 @@
+pkg-config-variable-function
+
+
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+ command which may be used to query for arbitrary variables from a package
+ (such as for related tools or data and plugin install paths).
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 0f2e22d..9c725fc 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -91,6 +91,26 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
endif()
endmacro()
+#[[.rst:
+.. command:: pkg_get_variable
+
+ Retrieves the value of a variable from a package. ::
+
+ pkg_get_variable( )
+
+ Examples
+
+ .. code-block:: cmake
+
+pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
+#]]
+function (pkg_get_variable result pkg variable)
+ _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
+ set("${result}"
+"${prefix_result}"
+PARENT_SCOPE)
+endfunction ()
+
# Invokes pkgconfig two times; once without '--static' and once with
# '--static'
macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
@@ -356,9 +376,9 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
endif()
_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}"
VERSION"" --modversion )
-_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}"
PREFIX "" --variable=prefix )
-_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}"
INCLUDEDIR "" --variable=includedir )
-_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}"
LIBDIR "" --variable=libdir )
+pkg_get_variable("${_pkg_check_prefix}_PREFIX"
${_pkg_check_modules_pkg} "prefix")
+pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR"
${_pkg_check_modules_pkg} "includedir")
+pkg_get_variable("${_pkg_check_prefix}_LIBDIR"
${_pkg_check_modules_pkg} "libdir")
if (NOT ${_is_silent})
message(STATUS " Found ${_pkg_check_modules_pkg}, version
${_pkgconfig_VERSION}")
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE-stdout.txt
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE-stdout.txt
new file mode 100644
index 000..5f211eb
--- /dev/null
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE-stdout.txt
@@ -0,0 +1 @@
+-- g_ir_scanner: .*/g-ir-scanner
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE.cmake
new file mode 100644
index 000..c85efaa
--- /dev/null
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE.cmake
@@ -0,0 +1,9 @@
+find_package(PkgConfig REQUIRED)
+pkg_c
[Cmake-commits] CMake branch, next, updated. v3.3.2-3084-g9c8534c
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 9c8534cd68bdfa1e3f479e3bd9c8681a26a05a4d (commit) via 971346addd9858b96acf81496f8d4091536235e9 (commit) via e69ed005747de6eeb05f0605c3ec80f780ed5317 (commit) via 666ea054fea69ab350a52374caaef139c1528e7f (commit) from 244bb3caa32a08d6719f0f3f1b63509e5373372f (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c8534cd68bdfa1e3f479e3bd9c8681a26a05a4d commit 9c8534cd68bdfa1e3f479e3bd9c8681a26a05a4d Merge: 244bb3c 971346a Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Fri Sep 18 13:21:20 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Sep 18 13:21:20 2015 -0400 Merge topic 'lib_depends-in-property-conflict' into next 971346ad Merge commit '24ea86e' into lib_depends-in-property-conflict e69ed005 variables: remove _LIB_DEPENDS variables 666ea054 UseVTKConfig40: remove unused module http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=971346addd9858b96acf81496f8d4091536235e9 commit 971346addd9858b96acf81496f8d4091536235e9 Merge: e69ed00 24ea86e Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Sep 17 13:29:32 2015 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu Sep 17 13:29:32 2015 -0400 Merge commit '24ea86e' into lib_depends-in-property-conflict * commit '24ea86e': try_compile: Propogate CMP0065 to the generated project. CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK__FLAGS Conflicts: Help/manual/cmake-policies.7.rst Source/cmPolicies.h Tests/RunCMake/CMakeLists.txt diff --cc Help/manual/cmake-policies.7.rst index da8cb83,ae5354f..38047ef --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@@ -122,4 -122,4 +122,5 @@@ All Policie /policy/CMP0062 /policy/CMP0063 /policy/CMP0064 +/policy/CMP0065 + /policy/CMP0066 diff --cc Source/cmPolicies.h index 2d16a0a,820c9cc..88bd6e2 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@@ -221,9 -221,10 +221,13 @@@ class cmPolicy SELECT(POLICY, CMP0064, \ "Support new TEST if() operator.", \ 3, 3, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0065, \ + "Only use additional flags to export symbols on executables with " \ + "the ENABLE_EXPORTS property.", \ -3, 3, 0, cmPolicies::WARN) ++3, 3, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0066, \ +"Deprecate _LIB_DEPENDS variables.", \ +3, 4, 0, cmPolicies::WARN) #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1) #define CM_FOR_EACH_POLICY_ID(POLICY) \ diff --cc Tests/RunCMake/CMakeLists.txt index a812299,d5d54fc..c0fea67 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@@ -104,7 -104,13 +104,14 @@@ add_RunCMake_test(CMP0057 add_RunCMake_test(CMP0059) add_RunCMake_test(CMP0060) add_RunCMake_test(CMP0064) +add_RunCMake_test(CMP0066) + + # The test for Policy 65 requires the use of the + # CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode + # generators ignore. The policy will have no effect on those generators. + if(NOT CMAKE_GENERATOR MATCHES "Visual Studio|Xcode") + add_RunCMake_test(CMP0065) + endif() if(CMAKE_GENERATOR MATCHES "Make") add_RunCMake_test(Make) endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e69ed005747de6eeb05f0605c3ec80f780ed5317 commit e69ed005747de6eeb05f0605c3ec80f780ed5317 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Sep 10 13:10:51 2015 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu Sep 17 13:17:52 2015 -0400 variables: remove _LIB_DEPENDS variables Introduces policy CMP0066 to avoid setting _LIB_DEPENDS cache variables to track the dependencies of a target. Instead, a global property is used to store the information since it is only required during a single configuration anyways. Benefits include reducing the size of the cache file, fewer variables to look through in the cache, and INTERFACE libraries can now have the same name as a target that previously existed (which errored out previously because old _LIB_DEPENDS variables would cause an error when the INTERFACE library was declared). diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 590f10d..da8cb83 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -12
[Cmake-commits] CMake branch, next, updated. v3.3.2-3089-gbb263cf
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 bb263cf5190cc181944ad126fafbfb4b3cd9ffdf (commit) via 26a027a34aec37d0c9baa9e043bb3fb2118a8e5e (commit) via f020f9f42183a94cdcd33fb14e9fc8d5eb721964 (commit) via c3072e67ac04f7c1a21c194dd1e4abe530c537ec (commit) via 6200814c97918824b093c4ec6b47183f1f341c01 (commit) from 9c8534cd68bdfa1e3f479e3bd9c8681a26a05a4d (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb263cf5190cc181944ad126fafbfb4b3cd9ffdf commit bb263cf5190cc181944ad126fafbfb4b3cd9ffdf Merge: 9c8534c 26a027a Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Fri Sep 18 13:25:52 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Sep 18 13:25:52 2015 -0400 Merge topic 'ctest-custom-output-size-more-docs' into next 26a027a3 Help: document CTEST_CUSTOM_* variables f020f9f4 ctest_read_custom_files: mention that ctest does this automatically c3072e67 CTEST_CUSTOM_*: treat variables as lists 6200814c CTestCoverageCollectGCOV: replace tabulators http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a027a34aec37d0c9baa9e043bb3fb2118a8e5e commit 26a027a34aec37d0c9baa9e043bb3fb2118a8e5e Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Sep 17 10:57:46 2015 -0400 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Fri Sep 18 13:25:03 2015 -0400 Help: document CTEST_CUSTOM_* variables diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 660d544..991cd55 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -374,8 +374,23 @@ Variables for CTest /variable/CTEST_COVERAGE_COMMAND /variable/CTEST_COVERAGE_EXTRA_FLAGS /variable/CTEST_CURL_OPTIONS + /variable/CTEST_CUSTOM_COVERAGE_EXCLUDE + /variable/CTEST_CUSTOM_ERROR_EXCEPTION + /variable/CTEST_CUSTOM_ERROR_MATCH + /variable/CTEST_CUSTOM_ERROR_POST_CONTEXT + /variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT /variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE + /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS + /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS /variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE + /variable/CTEST_CUSTOM_MEMCHECK_IGNORE + /variable/CTEST_CUSTOM_POST_MEMCHECK + /variable/CTEST_CUSTOM_POST_TEST + /variable/CTEST_CUSTOM_PRE_MEMCHECK + /variable/CTEST_CUSTOM_PRE_TEST + /variable/CTEST_CUSTOM_TEST_IGNORE + /variable/CTEST_CUSTOM_WARNING_EXCEPTION + /variable/CTEST_CUSTOM_WARNING_MATCH /variable/CTEST_CVS_CHECKOUT /variable/CTEST_CVS_COMMAND /variable/CTEST_CVS_UPDATE_OPTIONS @@ -385,6 +400,7 @@ Variables for CTest /variable/CTEST_DROP_SITE_CDASH /variable/CTEST_DROP_SITE_PASSWORD /variable/CTEST_DROP_SITE_USER + /variable/CTEST_EXTRA_COVERAGE_GLOB /variable/CTEST_GIT_COMMAND /variable/CTEST_GIT_UPDATE_CUSTOM /variable/CTEST_GIT_UPDATE_OPTIONS diff --git a/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst new file mode 100644 index 000..946114c --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst @@ -0,0 +1,8 @@ +CTEST_CUSTOM_COVERAGE_EXCLUDE +- + +A list of regular expressions which will be used to exclude files by their +path from coverage output by the :command:`ctest_coverage` command. + +.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_COVERAGE_EXCLUDE +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst new file mode 100644 index 000..cfb1093 --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst @@ -0,0 +1,8 @@ +CTEST_CUSTOM_ERROR_EXCEPTION + + +A list of regular expressions which will be used to exclude when detecting +error messages in build outputs by the :command:`ctest_test` command. + +.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_EXCEPTION +.. include:: CTEST_CUSTOM_XXX.txt diff --git a/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst new file mode 100644 index 000..dbb9c19 --- /dev/null +++ b/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst @@ -0,0 +1,8 @@ +CTEST_CUSTOM_ERROR_MATCH + + +A list of regular expressions which will be used to detect error messages in +build outputs by the :command:`ctest_test` command. + +.. |CTEST_CUSTOM_XXX| replace:: CTEST_CUSTOM_ERROR_MATCH +.. include:: CTEST_CUSTOM_
[Cmake-commits] CMake branch, next, updated. v3.3.0-1310-g3d0efda
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 3d0efdaf68b888d3c62a397dba72e437b1fed111 (commit)
via 594bafe52773c940fc3fb9cd9022a4d1a3a194c7 (commit)
from 7ab052ade7f7567534186b062c47b06880e626ef (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d0efdaf68b888d3c62a397dba72e437b1fed111
commit 3d0efdaf68b888d3c62a397dba72e437b1fed111
Merge: 7ab052a 594bafe
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jul 24 14:29:18 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 24 14:29:18 2015 -0400
Merge topic 'trace-expand' into next
594bafe5 cmake: add --trace-expand option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=594bafe52773c940fc3fb9cd9022a4d1a3a194c7
commit 594bafe52773c940fc3fb9cd9022a4d1a3a194c7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jul 21 17:18:53 2015 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 23 15:33:10 2015 -0400
cmake: add --trace-expand option
The --trace option is helpful, but sometimes, what you're looking for is
deep under many layers of function calls and figuring out what instance
of the function call you're looking at is tedious to determine (usually
involving patching and message()). Instead, add a --trace-expand option
to trace while expanding commands into what CMake actually sees.
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 4bd5a5e..9ce4971 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -113,14 +113,18 @@ Options
``--debug-output``
Put cmake in a debug mode.
- Print extra stuff during the cmake run like stack traces with
+ Print extra information during the cmake run like stack traces with
message(send_error ) calls.
``--trace``
Put cmake in trace mode.
- Print a trace of all calls made and from where with
- message(send_error ) calls.
+ Print a trace of all calls made and from where.
+
+``--trace-expand``
+ Put cmake in trace mode.
+
+ Like ``--trace``, but with variables expanded.
``--warn-uninitialized``
Warn about uninitialized values.
diff --git a/Help/release/dev/trace-expand.rst
b/Help/release/dev/trace-expand.rst
new file mode 100644
index 000..383326e
--- /dev/null
+++ b/Help/release/dev/trace-expand.rst
@@ -0,0 +1,5 @@
+trace-expand
+
+
+* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
+ variable references in the output.
diff --git a/Help/variable/CMAKE_POLICY_WARNING_CMP.rst
b/Help/variable/CMAKE_POLICY_WARNING_CMP.rst
index 092fe3e..8de0d56 100644
--- a/Help/variable/CMAKE_POLICY_WARNING_CMP.rst
+++ b/Help/variable/CMAKE_POLICY_WARNING_CMP.rst
@@ -17,5 +17,5 @@ warn by default:
This variable should not be set by a project in CMake code. Project
developers running CMake may set this variable in their cache to
enable the warning (e.g. ``-DCMAKE_POLICY_WARNING_CMP=ON``).
-Alternatively, running :manual:`cmake(1)` with the ``--debug-output``
-or ``--trace`` option will also enable the warning.
+Alternatively, running :manual:`cmake(1)` with the ``--debug-output``,
+``--trace``, or ``--trace-expand`` option will also enable the warning.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ae69b24..7c98970 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -307,10 +307,21 @@ void cmMakefile::PrintCommandTrace(const
cmListFileFunction lff) const
std::ostringstream msg;
msg this-GetExecutionFilePath() ( lff.Line ): ;
msg lff.Name (;
+ bool expand = this-GetCMakeInstance()-GetTraceExpand();
+ std::string temp;
for(std::vectorcmListFileArgument::const_iterator i =
lff.Arguments.begin(); i != lff.Arguments.end(); ++i)
{
-msg i-Value;
+if (expand)
+ {
+ temp = i-Value;
+ this-ExpandVariablesInString(temp);
+ msg temp;
+ }
+else
+ {
+ msg i-Value;
+ }
msg ;
}
msg );
@@ -4802,7 +4813,8 @@ bool cmMakefile::PolicyOptionalWarningEnabled(std::string
const var)
return cmSystemTools::IsOn(val);
}
}
- // Enable optional policy warnings with --debug-output or --trace.
+ // Enable optional policy warnings with --debug-output, --trace,
+ // or --trace-expand.
cmake* cm = this-GetCMakeInstance();
return cm-GetDebugOutput() || cm-GetTrace();
}
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7bf3832..6abdbed 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -121,6 +121,7 @@ void cmWarnUnusedCliWarning(const std::string
[Cmake-commits] CMake branch, next, updated. v3.2.2-2597-gd186a17
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 d186a17dcfc4c5950ccba09408f434dde606af59 (commit) via 5731fb2e5e30747a46b1e328539310d059115ad9 (commit) via 753da8c6f14f68d59978b63a57c343c7f0dec72f (commit) via 5ab896aede1efc0cd35ae73f0a9b400258fcad09 (commit) from fd1cf6da106a1f77e5d7b0c79c1c01677d41385f (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d186a17dcfc4c5950ccba09408f434dde606af59 commit d186a17dcfc4c5950ccba09408f434dde606af59 Merge: fd1cf6d 5731fb2 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu May 7 13:06:05 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 7 13:06:05 2015 -0400 Merge topic 'update-ctest_build-docs' into next 5731fb2e ctest_build: mention CTEST_BUILD_COMMAND in the docs 753da8c6 ctest_build: update the default target documentation 5ab896ae ctest_build: spruce up the documentation a bit http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5731fb2e5e30747a46b1e328539310d059115ad9 commit 5731fb2e5e30747a46b1e328539310d059115ad9 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu May 7 13:05:30 2015 -0400 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu May 7 13:05:54 2015 -0400 ctest_build: mention CTEST_BUILD_COMMAND in the docs diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index 2c3cfa8..5c0a4e9 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -29,7 +29,8 @@ that would have been printed to the console otherwise. The summary of warnings / errors, as well as the output from the native build tool is unaffected by this option. -If set, the contents of the variable ``CTEST_BUILD_FLAGS`` are passed as -additional arguments to the underlying build command. This can, e.g., be used -to trigger a parallel build using the ``-j`` option of make. See -:module:`ProcessorCount` for an example. +If set, the contents of the variable ``CTEST_BUILD_COMMAND`` is used to build +the project. In addition, if set, the contents of the variable +``CTEST_BUILD_FLAGS`` are passed as additional arguments to the underlying +build command. This can, e.g., be used to trigger a parallel build using the +``-j`` option of make. See :module:`ProcessorCount` for an example. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=753da8c6f14f68d59978b63a57c343c7f0dec72f commit 753da8c6f14f68d59978b63a57c343c7f0dec72f Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu May 7 13:05:15 2015 -0400 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu May 7 13:05:54 2015 -0400 ctest_build: update the default target documentation diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index 7c9029e..2c3cfa8 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -12,7 +12,8 @@ Builds the given build directory and stores results in Build.xml. If no ``BUILD`` is given, the :variable:`CTEST_BINARY_DIRECTORY` variable is used. The ``TARGET`` variable can be used to specify a build target. If none is -specified, the all target will be built. +specified, the default target (ALL_BUILD for Visual Studio generators and +all in others) will be built. The ``RETURN_VALUE`` option specifies a variable in which to store the return value of the native build tool. The ``NUMBER_ERRORS`` and http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ab896aede1efc0cd35ae73f0a9b400258fcad09 commit 5ab896aede1efc0cd35ae73f0a9b400258fcad09 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu May 7 13:04:21 2015 -0400 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu May 7 13:05:54 2015 -0400 ctest_build: spruce up the documentation a bit Adds markup and links to other sections. diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index e7a54d1..7c9029e 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -8,27 +8,27 @@ Build the project. ctest_build([BUILD build_dir] [TARGET target] [RETURN_VALUE res] [APPEND][NUMBER_ERRORS val] [NUMBER_WARNINGS val]) -Builds the given build directory and stores results in Build.xml. If -no BUILD is given, the CTEST_BINARY_DIRECTORY variable is used. +Builds the given build directory and stores results in Build.xml. If no +``BUILD`` is given, the :variable:`CTEST_BINARY_DIRECTORY` variable is used. -The TARGET variable can be used to specify a build target. If none is +The ``TARGET`` variable can be used to specify a build target
[Cmake-commits] CMake branch, next, updated. v3.2.2-2593-gfd1cf6d
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 fd1cf6da106a1f77e5d7b0c79c1c01677d41385f (commit)
via 0f5c6d89535655a83953b5b58ad8422778736780 (commit)
via b3ae0609db88d8f82f7fb4f18ddb73f3456a67d2 (commit)
from abd6448ad81d3c865c2462a41f965bf5775fc410 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd1cf6da106a1f77e5d7b0c79c1c01677d41385f
commit fd1cf6da106a1f77e5d7b0c79c1c01677d41385f
Merge: abd6448 0f5c6d8
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 7 13:01:46 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 7 13:01:46 2015 -0400
Merge topic 'replace-make--i' into next
0f5c6d89 cmGlobalUnixMakefileGenerator3: use -k rather than -i
b3ae0609 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5c6d89535655a83953b5b58ad8422778736780
commit 0f5c6d89535655a83953b5b58ad8422778736780
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 7 12:56:28 2015 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 7 13:01:04 2015 -0400
cmGlobalUnixMakefileGenerator3: use -k rather than -i
The `-i` flag ignores errors and causes the return code to always be
success. This causes problems because make implementations put i
into the MAKEFLAGS environment variable which is then used in any
submake invokations. This is particularly bad when using ExternalProject
which may use `make` during a configure step and can cause a project to
get invalid results when detecting its environment.
Instead, use `-k` which is similar except that the return code indicates
whether the tool actually completed successfully or not.
diff --git a/Help/release/dev/replace-make--i.rst
b/Help/release/dev/replace-make--i.rst
new file mode 100644
index 000..db50382
--- /dev/null
+++ b/Help/release/dev/replace-make--i.rst
@@ -0,0 +1,5 @@
+replace-make--i
+---
+
+* When building with :command:`ctest_build`, use ``-k`` rather than ``-i`` so
+ that the return code is meaningful.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h
b/Source/cmGlobalUnixMakefileGenerator3.h
index 165a3c8..67cb23f 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,7 +198,7 @@ protected:
cmGeneratedFileStream *CommandDatabase;
private:
- virtual const char* GetBuildIgnoreErrorsFlag() const { return -i; }
+ virtual const char* GetBuildIgnoreErrorsFlag() const { return -k; }
virtual std::string GetEditCacheCommand() const;
};
---
Summary of changes:
Help/release/dev/replace-make--i.rst|5 +
Source/CMakeVersion.cmake |2 +-
Source/cmGlobalUnixMakefileGenerator3.h |2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/replace-make--i.rst
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.2.1-1243-gf195280
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 f19528014b75129c08d5749239c86b2ceabaa6b7 (commit)
via a704098de83460e8e9bae02434a6c31e7fc3ffd7 (commit)
from a7fe79c03a8036edbb998809bd339cce2a0ac3f8 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19528014b75129c08d5749239c86b2ceabaa6b7
commit f19528014b75129c08d5749239c86b2ceabaa6b7
Merge: a7fe79c a704098
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Mar 26 18:14:02 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 18:14:02 2015 -0400
Merge topic 'fix-external-project-generator' into next
a704098d ExternalProject: fix the build command for generator overrides
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a704098de83460e8e9bae02434a6c31e7fc3ffd7
commit a704098de83460e8e9bae02434a6c31e7fc3ffd7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Mar 26 18:12:04 2015 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Mar 26 18:12:04 2015 -0400
ExternalProject: fix the build command for generator overrides
The `binary_dir` variable is never set, so this is invalid. Instead, use
. which all the other build commands use anyways. Also only set the
--config option if it is meaningful.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d7b985d..0c73d41 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var)
else()
set(cmd ${CMAKE_COMMAND})
endif()
-set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
+set(args --build .)
+if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL .)
+ list(APPEND args --config ${CMAKE_CFG_INTDIR})
+endif ()
if(step STREQUAL INSTALL)
list(APPEND args --target install)
endif()
---
Summary of changes:
Modules/ExternalProject.cmake |5 -
1 file changed, 4 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.1.1-2538-g2b24a11
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 2b24a1129330027717429d0a2be1ce7d7bd4202a (commit)
via 4c98de33d71fece4333607225ab030c1c7eee76c (commit)
via cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)
via 8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)
via 83ae27dcd18a746af35434bede9e3a7ee0aeef9b (commit)
from 951b4a382df85ca097859fdfb81bb3a6b886a0b9 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b24a1129330027717429d0a2be1ce7d7bd4202a
commit 2b24a1129330027717429d0a2be1ce7d7bd4202a
Merge: 951b4a3 4c98de3
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Feb 2 10:32:49 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Feb 2 10:32:49 2015 -0500
Merge topic 'fix-local-generator-config-check' into next
4c98de33 cmLocalGenerator: fix the default configuration check
cf38f686 CMake Nightly Date Stamp
8d69764d CMake Nightly Date Stamp
83ae27dc CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c98de33d71fece4333607225ab030c1c7eee76c
commit 4c98de33d71fece4333607225ab030c1c7eee76c
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Mon Feb 2 10:31:43 2015 -0500
Commit: Ben Boeckel maths...@gmail.com
CommitDate: Mon Feb 2 10:31:43 2015 -0500
cmLocalGenerator: fix the default configuration check
Empty also means the default configuration should be used.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..6b7a520 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -425,7 +425,7 @@ void cmLocalGenerator::GenerateInstallRules()
{
default_config = configurationTypes[0].c_str();
}
- if(!default_config)
+ if(!default_config || !*default_config)
{
default_config = Release;
}
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmLocalGenerator.cxx |2 +-
2 files changed, 2 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.1.0-2281-ga75bb83
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 a75bb8377e228107917135b06a1af42aec1ecd52 (commit)
via 38ad671c4a5ef9e2346893b7dfa37a8a67c16c1e (commit)
via caeffcc6b43df91f09fe3502454119148362a543 (commit)
from 6a5da86d1eb53526ad48724cae6ce23151f56e0e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a75bb8377e228107917135b06a1af42aec1ecd52
commit a75bb8377e228107917135b06a1af42aec1ecd52
Merge: 6a5da86 38ad671
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 13:20:17 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 21 13:20:17 2015 -0500
Merge topic 'ninja-generate-outputs' into next
38ad671c test: test that ninja regenerates properly
caeffcc6 ninja: list outputs of CMake's generate step
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38ad671c4a5ef9e2346893b7dfa37a8a67c16c1e
commit 38ad671c4a5ef9e2346893b7dfa37a8a67c16c1e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 13:16:33 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jan 21 13:16:33 2015 -0500
test: test that ninja regenerates properly
Currently tests that the ninja files are regenerated when any of the
following occurs:
- an input for a configure_file is touched;
- an input for a try_compile is touched; and
- an output of a configure_file is removed.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 3a61751..358a918 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -175,3 +175,7 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
+
+if(CMAKE_GENERATOR MATCHES Ninja)
+ add_RunCMake_test(ninja)
+endif()
diff --git a/Tests/RunCMake/ninja/CMakeLists.txt
b/Tests/RunCMake/ninja/CMakeLists.txt
new file mode 100644
index 000..67a38be
--- /dev/null
+++ b/Tests/RunCMake/ninja/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 2.8.4)
+
+set(test_binary_dir ${test_binary_root}/init-build)
+
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ninja/RunCMakeTest.cmake
b/Tests/RunCMake/ninja/RunCMakeTest.cmake
new file mode 100644
index 000..4bf4ed1
--- /dev/null
+++ b/Tests/RunCMake/ninja/RunCMakeTest.cmake
@@ -0,0 +1,21 @@
+include(RunCMake)
+
+# Test that Ninja is rerun properly.
+set(test_dir ${CMAKE_CURRENT_BINARY_DIR}/ninja/test)
+
+set(RunCMake_BINARY_DIR ${test_dir})
+run_cmake(init)
+
+function (busy_loop)
+ execute_process(
+COMMAND ${CMAKE_COMMAND} -E sleep
+2)
+endfunction ()
+
+set(RunCMake_TEST_OPTIONS -Dtest_binary_root=${test_dir})
+busy_loop()
+run_cmake(touch_try_compile)
+busy_loop()
+run_cmake(remove_configured_file)
+busy_loop()
+run_cmake(touch_configure)
diff --git a/Tests/RunCMake/ninja/check_build.cmake
b/Tests/RunCMake/ninja/check_build.cmake
new file mode 100644
index 000..0969639
--- /dev/null
+++ b/Tests/RunCMake/ninja/check_build.cmake
@@ -0,0 +1,24 @@
+function (busy_loop)
+ execute_process(
+COMMAND ${CMAKE_COMMAND} -E sleep
+2)
+endfunction ()
+
+file(TIMESTAMP ${test_binary_dir}/build.ninja orig_time %Y%m%d%H%M%S)
+
+busy_loop()
+# Force NINJA_STATUS to be a certain style to not break the regex.
+set(ENV{NINJA_STATUS} [%s/%t] )
+execute_process(
+ COMMAND ${CMAKE_MAKE_PROGRAM}
+ OUTPUT_VARIABLE out
+ ERROR_VARIABLEerr
+ WORKING_DIRECTORY ${test_binary_dir})
+message(--${out}--)
+message(--${err}--)
+
+file(TIMESTAMP ${test_binary_dir}/build.ninja rerun_time %Y%m%d%H%M%S)
+
+if (NOT rerun_time GREATER orig_time)
+ message(FATAL_ERROR Ninja did not rerun? (old: ${orig_time}; new:
${rerun_time}))
+endif ()
diff --git a/Tests/RunCMake/ninja/init-stderr.txt
b/Tests/RunCMake/ninja/init-stderr.txt
new file mode 100644
index 000..3510266
--- /dev/null
+++ b/Tests/RunCMake/ninja/init-stderr.txt
@@ -0,0 +1 @@
+^FALSE$
diff --git a/Tests/RunCMake/ninja/init.cmake b/Tests/RunCMake/ninja/init.cmake
new file mode 100644
index 000..48b1f23
--- /dev/null
+++ b/Tests/RunCMake/ninja/init.cmake
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.0)
+project(ninja C)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/test.txt.in
+ ${CMAKE_CURRENT_BINARY_DIR}/test.txt)
+
+try_compile(res
+ ${CMAKE_CURRENT_BINARY_DIR}/bin
+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tc.c)
+message(${res})
diff --git a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
b/Tests/RunCMake/ninja
[Cmake-commits] CMake branch, next, updated. v3.1.0-2300-g45049ec
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 45049eca97e8931721f4a371e136a012c0473e8d (commit)
via f4b78cf2ac9785ae02e910ac5566718fd8592f10 (commit)
via fe685b92ecffdcb889806b0fc882d3fe75244b59 (commit)
via ae723db5b4b4a4152547eae6166cbcc073767512 (commit)
from 42eb85d6c7bfac664fee8df62bf0ccb84b8e4e5c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45049eca97e8931721f4a371e136a012c0473e8d
commit 45049eca97e8931721f4a371e136a012c0473e8d
Merge: 42eb85d f4b78cf
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 16:50:26 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 21 16:50:26 2015 -0500
Merge topic 'ninja-generate-outputs' into next
f4b78cf2 fixup! test: test that ninja regenerates properly
fe685b92 fixup! test: test that ninja regenerates properly
ae723db5 fixup! test: test that ninja regenerates properly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b78cf2ac9785ae02e910ac5566718fd8592f10
commit f4b78cf2ac9785ae02e910ac5566718fd8592f10
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 16:47:58 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jan 21 16:48:31 2015 -0500
fixup! test: test that ninja regenerates properly
diff --git a/Tests/RunCMake/ninja/check_build.cmake
b/Tests/RunCMake/ninja/check_build.cmake
index 7071228..093f18e 100644
--- a/Tests/RunCMake/ninja/check_build.cmake
+++ b/Tests/RunCMake/ninja/check_build.cmake
@@ -23,3 +23,19 @@ file(TIMESTAMP ${test_binary_dir}/build.ninja rerun_time
%Y%m%d%H%M%S)
if (NOT rerun_time GREATER orig_time)
message(FATAL_ERROR Ninja did not rerun? (old: ${orig_time}; new:
${rerun_time}))
endif ()
+
+busy_loop()
+execute_process(
+ COMMAND ${CMAKE_COMMAND}
+--build .
+ OUTPUT_VARIABLE out
+ ERROR_VARIABLEerr
+ WORKING_DIRECTORY ${test_binary_dir})
+message(--${out}--)
+message(--${err}--)
+
+file(TIMESTAMP ${test_binary_dir}/build.ninja noop_time %Y%m%d%H%M%S)
+
+if (NOT rerun_time EQUAL noop_time)
+ message(FATAL_ERROR Ninja found something to do? (old: ${rerun_time}; new:
${noop_time}))
+endif ()
diff --git a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
b/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
+++ b/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
--
--FALSE
---$
+--
+--ninja: no work to do.
+--
+$
diff --git a/Tests/RunCMake/ninja/touch_configure-stderr.txt
b/Tests/RunCMake/ninja/touch_configure-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/touch_configure-stderr.txt
+++ b/Tests/RunCMake/ninja/touch_configure-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
--
--FALSE
---$
+--
+--ninja: no work to do.
+--
+$
diff --git a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
b/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
+++ b/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
--
--FALSE
---$
+--
+--ninja: no work to do.
+--
+$
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe685b92ecffdcb889806b0fc882d3fe75244b59
commit fe685b92ecffdcb889806b0fc882d3fe75244b59
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 16:47:58 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jan 21 16:47:58 2015 -0500
fixup! test: test that ninja regenerates properly
diff --git a/Tests/RunCMake/ninja/check_build.cmake
b/Tests/RunCMake/ninja/check_build.cmake
index 0969639..7071228 100644
--- a/Tests/RunCMake/ninja/check_build.cmake
+++ b/Tests/RunCMake/ninja/check_build.cmake
@@ -10,7 +10,8 @@ busy_loop()
# Force NINJA_STATUS to be a certain style to not break the regex.
set(ENV{NINJA_STATUS} [%s/%t] )
execute_process(
- COMMAND ${CMAKE_MAKE_PROGRAM}
+ COMMAND ${CMAKE_COMMAND}
+--build .
OUTPUT_VARIABLE out
ERROR_VARIABLEerr
WORKING_DIRECTORY ${test_binary_dir})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae723db5b4b4a4152547eae6166cbcc073767512
commit ae723db5b4b4a4152547eae6166cbcc073767512
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 21 16:46:43 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jan 21 16:47:27 2015 -0500
fixup! test: test that ninja regenerates
[Cmake-commits] CMake branch, next, updated. v3.1.0-2291-gc709ebb
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 c709ebb08e675fc4603187cd8a125a6b8f704436 (commit) via bebdb4540b94aae3f213af586dbd7d1445ef25e5 (commit) from 7f7c996a707e206c8cd87bb97689b77ad249e114 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c709ebb08e675fc4603187cd8a125a6b8f704436 commit c709ebb08e675fc4603187cd8a125a6b8f704436 Merge: 7f7c996 bebdb45 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Wed Jan 21 15:57:31 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 21 15:57:31 2015 -0500 Merge topic 'add-missing-variable-docs' into next bebdb454 Help: add missing MINGW variable documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bebdb4540b94aae3f213af586dbd7d1445ef25e5 commit bebdb4540b94aae3f213af586dbd7d1445ef25e5 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Wed Jan 21 15:48:00 2015 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Wed Jan 21 15:48:00 2015 -0500 Help: add missing MINGW variable documentation diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index af2c348..c342dbe 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -181,6 +181,7 @@ Variables that Describe the System /variable/CMAKE_SYSTEM_VERSION /variable/CYGWIN /variable/ENV + /variable/MINGW /variable/MSVC10 /variable/MSVC11 /variable/MSVC12 diff --git a/Help/variable/MINGW.rst b/Help/variable/MINGW.rst new file mode 100644 index 000..521d417 --- /dev/null +++ b/Help/variable/MINGW.rst @@ -0,0 +1,6 @@ +MINGW +- + +True when using MinGW + +Set to true when the compiler is some version of MinGW. --- Summary of changes: Help/manual/cmake-variables.7.rst |1 + Help/variable/MINGW.rst |6 ++ 2 files changed, 7 insertions(+) create mode 100644 Help/variable/MINGW.rst 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.1.0-2270-g656ddc5
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 656ddc52c42f8fdfd22d331ceaa669c479124555 (commit)
via ddfe463d8f62641f2e80e0c5cc0cb78203ea63ac (commit)
from 850d020125bddf09624713a1c49fd42030b04ab1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=656ddc52c42f8fdfd22d331ceaa669c479124555
commit 656ddc52c42f8fdfd22d331ceaa669c479124555
Merge: 850d020 ddfe463
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jan 20 14:53:27 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jan 20 14:53:27 2015 -0500
Merge topic 'ninja-rsp_file-calculation' into next
ddfe463d ninja: use the minimum of all possible command line lengths
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddfe463d8f62641f2e80e0c5cc0cb78203ea63ac
commit ddfe463d8f62641f2e80e0c5cc0cb78203ea63ac
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jan 14 13:11:44 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jan 20 14:53:03 2015 -0500
ninja: use the minimum of all possible command line lengths
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index e344df4..a926447 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -22,6 +22,7 @@
#include assert.h
#include algorithm
+#include limits
#ifndef _WIN32
#include unistd.h
@@ -358,15 +359,29 @@ cmNinjaNormalTargetGenerator
static int calculateCommandLineLengthLimit(int linkRuleLength)
{
+ static int limits[] = {
#ifdef _WIN32
- return 8000 - linkRuleLength;
-#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__)
- // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
- return ((int)sysconf(_SC_ARG_MAX)) - linkRuleLength - 1000;
-#else
- (void)linkRuleLength;
- return -1;
+8000 - linkRuleLength,
#endif
+#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
+// for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
+((int)sysconf(_SC_ARG_MAX)) - linkRuleLength - 1000,
+#endif
+#if defined(__linux)
+// #define MAX_ARG_STRLEN (PAGE_SIZE * 32) in Linux's binfmts.h
+((int)sysconf(_SC_PAGESIZE) * 32) - linkRuleLength - 1000,
+#endif
+std::numeric_limitsint::max()
+ };
+
+ size_t arrSz = cmArraySize(limits);
+ int sz = *std::min_element(limits, limits + arrSz);
+ if (sz == std::numeric_limitsint::max())
+{
+return -1;
+}
+
+ return sz;
}
---
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 29 ++---
1 file changed, 22 insertions(+), 7 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.1.0-2061-g5528f24
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 5528f24229ee49e2bb5fab3e7b4e4d117099021f (commit)
via a7cb6054223c6717c1c49378bd7446e12a5000b5 (commit)
from 017d7c3c8c666fbb5c43c266e7af9957cf710f6e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5528f24229ee49e2bb5fab3e7b4e4d117099021f
commit 5528f24229ee49e2bb5fab3e7b4e4d117099021f
Merge: 017d7c3 a7cb605
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 16 17:40:45 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 16 17:40:45 2015 -0500
Merge topic 'xcode-target-sort' into next
a7cb6054 cmGlobalXCodeGenerator: sort targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7cb6054223c6717c1c49378bd7446e12a5000b5
commit a7cb6054223c6717c1c49378bd7446e12a5000b5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 16 17:37:26 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 16 17:38:35 2015 -0500
cmGlobalXCodeGenerator: sort targets
The default target in XCode is the first one in the file. Sort targets
so that ALL_BUILD is always first.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 13e6988..0899614 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -966,6 +966,23 @@ struct cmSourceFilePathCompare
};
//
+struct cmCompareTargets
+{
+ bool operator () (std::string const a, std::string const b) const
+ {
+if (a == ALL_BUILD)
+ {
+ return true;
+ }
+if (b == ALL_BUILD)
+ {
+ return false;
+ }
+return strcmp(a.c_str(), b.c_str()) 0;
+ }
+};
+
+//
void
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
std::vectorcmXCodeObject*
@@ -973,9 +990,16 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
{
this-SetCurrentLocalGenerator(gen);
cmTargets tgts = this-CurrentMakefile-GetTargets();
+ typedef std::mapstd::string, cmTarget*, cmCompareTargets cmSortedTargets;
+ cmSortedTargets sortedTargets;
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
{
-cmTarget cmtarget = l-second;
+sortedTargets[l-first] = l-second;
+}
+ for(cmSortedTargets::iterator l = sortedTargets.begin();
+ l != sortedTargets.end(); l++)
+{
+cmTarget cmtarget = *l-second;
cmGeneratorTarget* gtgt = this-GetGeneratorTarget(cmtarget);
// make sure ALL_BUILD, INSTALL, etc are only done once
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 26 +-
1 file changed, 25 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.1.0-1780-g1839501
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 183950101b44830bd458201dae0e9c2c7762ed39 (commit)
via bba9705e96ec3f97a25a4f7029f79150785e2003 (commit)
from 214d354dcb9a170500a17c2213e4dde7f903ec1d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=183950101b44830bd458201dae0e9c2c7762ed39
commit 183950101b44830bd458201dae0e9c2c7762ed39
Merge: 214d354 bba9705
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 09:23:35 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 12 09:23:35 2015 -0500
Merge topic 'safer-msmpi-checks' into next
bba9705e FindMPI: handle trailing slash from $MSMPI_BIN
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bba9705e96ec3f97a25a4f7029f79150785e2003
commit bba9705e96ec3f97a25a4f7029f79150785e2003
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 09:21:23 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jan 12 09:23:23 2015 -0500
FindMPI: handle trailing slash from $MSMPI_BIN
When installing, MSMPI puts a trailing backslash in the MSMPI_BIN
environment variable. This causes trouble when concatenating in CMake
since the list separator is now escaped and no longer a list separator
due to the trailing backslash. Instead, add in a dummy forward slash
which doesn't change the path, but uses up the backslash.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9192054..13b9bdf 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -175,7 +175,7 @@ set(_MPI_EXEC_NAMESmpiexec mpirun
lamexec srun)
set(_MPI_PREFIX_PATH)
if(WIN32)
# MSMPI
- list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_BIN})
+ list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_BIN}/)
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin)
list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_INC}/..) # The SDK is installed
separately from the runtime
# MPICH
---
Summary of changes:
Modules/FindMPI.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.1.0-1796-gfbecece
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 fbecece01a35c39504d190af3976b2e861745862 (commit)
via 1cc5d81139a9ee92dfbea04eb91cad9abcbe622c (commit)
from 3bc2cacc230c3270883eb05d7398f27036ef33ac (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbecece01a35c39504d190af3976b2e861745862
commit fbecece01a35c39504d190af3976b2e861745862
Merge: 3bc2cac 1cc5d81
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 10:52:49 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 12 10:52:49 2015 -0500
Merge topic 'safer-msmpi-checks' into next
1cc5d811 FindMPI: use file(TO_CMAKE_PATH) to remove '\'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cc5d81139a9ee92dfbea04eb91cad9abcbe622c
commit 1cc5d81139a9ee92dfbea04eb91cad9abcbe622c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 10:52:27 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jan 12 10:52:27 2015 -0500
FindMPI: use file(TO_CMAKE_PATH) to remove '\'
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 13b9bdf..62272f8 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -175,7 +175,8 @@ set(_MPI_EXEC_NAMESmpiexec mpirun
lamexec srun)
set(_MPI_PREFIX_PATH)
if(WIN32)
# MSMPI
- list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_BIN}/)
+ file(TO_CMAKE_PATH $ENV{MSMPI_BIN} msmpi_bin_path) # The default path ends
with a '\' and doesn't mix with ';' when appending.
+ list(APPEND _MPI_PREFIX_PATH ${msmpi_bin_path})
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin)
list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_INC}/..) # The SDK is installed
separately from the runtime
# MPICH
---
Summary of changes:
Modules/FindMPI.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.1.0-1804-g5ae1335
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 5ae13355efec27b1acb6e65bd411bb2c012fb952 (commit)
via eda08400439811a938f10bd7a9f662166e78dad6 (commit)
from 6de9d59f46094043c358d0cc5aa5a7b532bbecf6 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ae13355efec27b1acb6e65bd411bb2c012fb952
commit 5ae13355efec27b1acb6e65bd411bb2c012fb952
Merge: 6de9d59 eda0840
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 13:31:47 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 12 13:31:47 2015 -0500
Merge topic 'safer-msmpi-checks' into next
eda08400 FindMPI: drop local variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda08400439811a938f10bd7a9f662166e78dad6
commit eda08400439811a938f10bd7a9f662166e78dad6
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 12 13:31:38 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jan 12 13:31:38 2015 -0500
FindMPI: drop local variable
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 62272f8..545b077 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -177,6 +177,7 @@ if(WIN32)
# MSMPI
file(TO_CMAKE_PATH $ENV{MSMPI_BIN} msmpi_bin_path) # The default path ends
with a '\' and doesn't mix with ';' when appending.
list(APPEND _MPI_PREFIX_PATH ${msmpi_bin_path})
+ unset(msmpi_bin_path)
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin)
list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_INC}/..) # The SDK is installed
separately from the runtime
# MPICH
---
Summary of changes:
Modules/FindMPI.cmake |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.1.0-1614-g2cfa421
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 2cfa421ac245f83e98783ecb677bbe69def1e1e0 (commit)
via 55be5992cf539fd56bf86a0c588d7e98d6be5ac3 (commit)
from 3a7edeacb08fdb8f2ab82842b7de528e7f637d36 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cfa421ac245f83e98783ecb677bbe69def1e1e0
commit 2cfa421ac245f83e98783ecb677bbe69def1e1e0
Merge: 3a7edea 55be599
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:43:55 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 9 10:43:55 2015 -0500
Merge topic 'fix-empty-target-property-queries' into next
55be5992 tests: add tests for querying properties
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55be5992cf539fd56bf86a0c588d7e98d6be5ac3
commit 55be5992cf539fd56bf86a0c588d7e98d6be5ac3
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jan 8 15:27:46 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 10:43:42 2015 -0500
tests: add tests for querying properties
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b5e41d9..05c51cc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -173,3 +173,4 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
+add_RunCMake_test(get_property)
diff --git a/Tests/RunCMake/get_property/CMakeLists.txt
b/Tests/RunCMake/get_property/CMakeLists.txt
new file mode 100644
index 000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/get_property/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/get_property/RunCMakeTest.cmake
b/Tests/RunCMake/get_property/RunCMakeTest.cmake
new file mode 100644
index 000..1964824
--- /dev/null
+++ b/Tests/RunCMake/get_property/RunCMakeTest.cmake
@@ -0,0 +1,9 @@
+include(RunCMake)
+
+run_cmake(cache_properties)
+run_cmake(directory_properties)
+run_cmake(global_properties)
+run_cmake(install_properties)
+run_cmake(source_properties)
+run_cmake(target_properties)
+run_cmake(test_properties)
diff --git a/Tests/RunCMake/get_property/cache_properties-stderr.txt
b/Tests/RunCMake/get_property/cache_properties-stderr.txt
new file mode 100644
index 000..ee019c6
--- /dev/null
+++ b/Tests/RunCMake/get_property/cache_properties-stderr.txt
@@ -0,0 +1,3 @@
+^get_property:
+get_property: --TRUE--
+get_property: $
diff --git a/Tests/RunCMake/get_property/cache_properties.cmake
b/Tests/RunCMake/get_property/cache_properties.cmake
new file mode 100644
index 000..bf3e7ab
--- /dev/null
+++ b/Tests/RunCMake/get_property/cache_properties.cmake
@@ -0,0 +1,15 @@
+function (check_cache_property var prop)
+ get_property(gp_val
+CACHE ${var}
+PROPERTY ${prop})
+
+ message(get_property: --${gp_val}--)
+endfunction ()
+
+set(var val CACHE STRING doc)
+set_property(CACHE var PROPERTY VALUE ) # empty
+set_property(CACHE var PROPERTY ADVANCED TRUE)
+
+check_cache_property(var VALUE)
+check_cache_property(var ADVANCED)
+check_cache_property(var noexist)
diff --git a/Tests/RunCMake/get_property/directory_properties-stderr.txt
b/Tests/RunCMake/get_property/directory_properties-stderr.txt
new file mode 100644
index 000..80c9877
--- /dev/null
+++ b/Tests/RunCMake/get_property/directory_properties-stderr.txt
@@ -0,0 +1,6 @@
+^get_directory_property:
+get_property:
+get_directory_property: --value--
+get_property: --value--
+get_directory_property:
+get_property: $
diff --git a/Tests/RunCMake/get_property/directory_properties.cmake
b/Tests/RunCMake/get_property/directory_properties.cmake
new file mode 100644
index 000..b0a9b1b
--- /dev/null
+++ b/Tests/RunCMake/get_property/directory_properties.cmake
@@ -0,0 +1,15 @@
+function (check_directory_property dir prop)
+ get_directory_property(gdp_val DIRECTORY ${dir} ${prop})
+ get_property(gp_val
+DIRECTORY ${dir}
+PROPERTY ${prop})
+
+ message(get_directory_property: --${gdp_val}--)
+ message(get_property: --${gp_val}--)
+endfunction ()
+
+set_directory_properties(PROPERTIES empty custom value)
+
+check_directory_property(${CMAKE_CURRENT_SOURCE_DIR} empty)
+check_directory_property(${CMAKE_CURRENT_SOURCE_DIR} custom)
+check_directory_property(${CMAKE_CURRENT_SOURCE_DIR} noexist)
diff --git a/Tests/RunCMake/get_property/global_properties-stderr.txt
b/Tests/RunCMake/get_property/global_properties-stderr.txt
new file mode 100644
index 000
[Cmake-commits] CMake branch, next, updated. v3.1.0-1618-g76e41f6
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 76e41f6262ebabcc7e60ecd8112e09fa928e07db (commit)
via 2072cb81f822d5ffc53f9daba83a03d8c4266207 (commit)
via 37c5883963d6fc396a6a71081109ab1b47ead9a4 (commit)
via df16dcfb4478bb05932a1abb0e42433e60f1a565 (commit)
from 2cfa421ac245f83e98783ecb677bbe69def1e1e0 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76e41f6262ebabcc7e60ecd8112e09fa928e07db
commit 76e41f6262ebabcc7e60ecd8112e09fa928e07db
Merge: 2cfa421 2072cb8
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:43:59 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 9 10:43:59 2015 -0500
Merge topic 'add-xz-support' into next
2072cb81 cmake -E tar: error out on multiple compression formats
37c58839 cmSystemTools: use an enumeration for compression formats
df16dcfb cmake -E tar: add support for .xz files with 'J'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2072cb81f822d5ffc53f9daba83a03d8c4266207
commit 2072cb81f822d5ffc53f9daba83a03d8c4266207
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:33:36 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 10:35:01 2015 -0500
cmake -E tar: error out on multiple compression formats
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index cf3b2de..1bfbb55 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -735,17 +735,27 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
}
cmSystemTools::cmTarCompression compress =
cmSystemTools::TarCompressNone;
+ int nCompress = 0;
if ( flags.find_first_of('j') != flags.npos )
{
compress = cmSystemTools::TarCompressBZip2;
+++nCompress;
}
if ( flags.find_first_of('J') != flags.npos )
{
compress = cmSystemTools::TarCompressXZ;
+++nCompress;
}
if ( flags.find_first_of('z') != flags.npos )
{
compress = cmSystemTools::TarCompressGZip;
+++nCompress;
+}
+ if ( nCompress 1 )
+{
+cmSystemTools::Error(Can only compress a tar file one way;
+ at most one flag of z, j, or J may be used);
+return 1;
}
if ( flags.find_first_of('v') != flags.npos )
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c5883963d6fc396a6a71081109ab1b47ead9a4
commit 37c5883963d6fc396a6a71081109ab1b47ead9a4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:33:00 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 10:35:01 2015 -0500
cmSystemTools: use an enumeration for compression formats
Juggling 3 booleans was unwieldy.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f02d78e..e1391a7 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1675,7 +1675,7 @@ std::string cmCTest::Base64GzipEncodeFile(std::string
file)
files.push_back(file);
if(!cmSystemTools::CreateTar(tarFile.c_str(), files,
- true, false, false, false))
+ cmSystemTools::TarCompressGZip, false))
{
cmCTestLog(this, ERROR_MESSAGE, Error creating tar while
encoding file: file std::endl);
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index cd63347..036e859 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1482,7 +1482,7 @@ bool cmSystemTools::IsPathToFramework(const char* path)
bool cmSystemTools::CreateTar(const char* outFileName,
const std::vectorstd::string files,
- bool gzip, bool bzip2, bool xz,
+ cmTarCompression compressType,
bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -1497,11 +1497,24 @@ bool cmSystemTools::CreateTar(const char* outFileName,
cmSystemTools::Error(e.c_str());
return false;
}
- cmArchiveWrite a(fout, (gzip? cmArchiveWrite::CompressGZip :
- (bzip2? cmArchiveWrite::CompressBZip2 :
- (xz? cmArchiveWrite::CompressXZ :
- cmArchiveWrite::CompressNone))),
- cmArchiveWrite::TypeTAR);
+ cmArchiveWrite::Compress compress = cmArchiveWrite::CompressNone;
+ switch (compressType)
+{
+case TarCompressGZip:
+ compress = cmArchiveWrite::CompressGZip;
+ break;
+case TarCompressBZip2
[Cmake-commits] CMake branch, next, updated. v3.1.0-1609-g8b355d6
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 8b355d64de0d1d899a0c58a12285b7514f8d8e18 (commit)
via 8833206e35bafa04a2264e3e60061651e4b41c2d (commit)
via f98c15814512d7e111f8ac738cedd39d1bfbd9e2 (commit)
via e0d8912dea950faf8d3ee875896d2ad2197b6e73 (commit)
from e51cf4204b190f9e85186b3552634bb7bc22f76d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b355d64de0d1d899a0c58a12285b7514f8d8e18
commit 8b355d64de0d1d899a0c58a12285b7514f8d8e18
Merge: e51cf42 8833206
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:34:50 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 9 10:34:50 2015 -0500
Merge topic 'add-xz-support' into next
8833206e cmake -E tar: error out on multiple compression formats
f98c1581 cmSystemTools: use an enumeration for compression formats
e0d8912d fixup! cmake -E tar: add support for .xz files with 'J'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8833206e35bafa04a2264e3e60061651e4b41c2d
commit 8833206e35bafa04a2264e3e60061651e4b41c2d
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:33:36 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 10:33:36 2015 -0500
cmake -E tar: error out on multiple compression formats
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index cf3b2de..1bfbb55 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -735,17 +735,27 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
}
cmSystemTools::cmTarCompression compress =
cmSystemTools::TarCompressNone;
+ int nCompress = 0;
if ( flags.find_first_of('j') != flags.npos )
{
compress = cmSystemTools::TarCompressBZip2;
+++nCompress;
}
if ( flags.find_first_of('J') != flags.npos )
{
compress = cmSystemTools::TarCompressXZ;
+++nCompress;
}
if ( flags.find_first_of('z') != flags.npos )
{
compress = cmSystemTools::TarCompressGZip;
+++nCompress;
+}
+ if ( nCompress 1 )
+{
+cmSystemTools::Error(Can only compress a tar file one way;
+ at most one flag of z, j, or J may be used);
+return 1;
}
if ( flags.find_first_of('v') != flags.npos )
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f98c15814512d7e111f8ac738cedd39d1bfbd9e2
commit f98c15814512d7e111f8ac738cedd39d1bfbd9e2
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:33:00 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 10:33:00 2015 -0500
cmSystemTools: use an enumeration for compression formats
Juggling 3 booleans was unwieldy.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f02d78e..e1391a7 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1675,7 +1675,7 @@ std::string cmCTest::Base64GzipEncodeFile(std::string
file)
files.push_back(file);
if(!cmSystemTools::CreateTar(tarFile.c_str(), files,
- true, false, false, false))
+ cmSystemTools::TarCompressGZip, false))
{
cmCTestLog(this, ERROR_MESSAGE, Error creating tar while
encoding file: file std::endl);
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index cd63347..036e859 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1482,7 +1482,7 @@ bool cmSystemTools::IsPathToFramework(const char* path)
bool cmSystemTools::CreateTar(const char* outFileName,
const std::vectorstd::string files,
- bool gzip, bool bzip2, bool xz,
+ cmTarCompression compressType,
bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -1497,11 +1497,24 @@ bool cmSystemTools::CreateTar(const char* outFileName,
cmSystemTools::Error(e.c_str());
return false;
}
- cmArchiveWrite a(fout, (gzip? cmArchiveWrite::CompressGZip :
- (bzip2? cmArchiveWrite::CompressBZip2 :
- (xz? cmArchiveWrite::CompressXZ :
- cmArchiveWrite::CompressNone))),
- cmArchiveWrite::TypeTAR);
+ cmArchiveWrite::Compress compress = cmArchiveWrite::CompressNone;
+ switch (compressType)
+{
+case TarCompressGZip:
+ compress = cmArchiveWrite::CompressGZip;
+ break;
+case TarCompressBZip2
[Cmake-commits] CMake branch, next, updated. v3.1.0-1627-gb5061d4
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 b5061d40e11d93a449736ffa0b363a36bea97898 (commit)
via 7cd1b9bf75fcac42b937e5aae4d3f5a6a61fcb4e (commit)
via 312ac7257eacbe909f0544a8e9bce3f11f404a26 (commit)
via 54df2294ed54b2b6746d94534ff6584371e9d082 (commit)
from 5f3322884cc5903d3198f760191e2990c361330d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5061d40e11d93a449736ffa0b363a36bea97898
commit b5061d40e11d93a449736ffa0b363a36bea97898
Merge: 5f33228 7cd1b9b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 12:05:59 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 9 12:05:59 2015 -0500
Merge topic 'add-xz-support' into next
7cd1b9bf cmSystemTools: remove unused gzip argument
312ac725 cmake -E tar: error out on multiple compression formats
54df2294 cmSystemTools: use an enumeration for compression formats
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cd1b9bf75fcac42b937e5aae4d3f5a6a61fcb4e
commit 7cd1b9bf75fcac42b937e5aae4d3f5a6a61fcb4e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 12:04:56 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 12:05:48 2015 -0500
cmSystemTools: remove unused gzip argument
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 036e859..0271665 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1800,7 +1800,7 @@ bool extract_tar(const char* outFileName, bool verbose,
#endif
bool cmSystemTools::ExtractTar(const char* outFileName,
- bool , bool verbose)
+ bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
return extract_tar(outFileName, verbose, true);
@@ -1812,7 +1812,6 @@ bool cmSystemTools::ExtractTar(const char* outFileName,
}
bool cmSystemTools::ListTar(const char* outFileName,
-bool ,
bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ad269b1..09ceea6 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -391,11 +391,11 @@ public:
TarCompressNone
};
static bool ListTar(const char* outFileName,
- bool gzip, bool verbose);
+ bool verbose);
static bool CreateTar(const char* outFileName,
const std::vectorstd::string files,
cmTarCompression compressType, bool verbose);
- static bool ExtractTar(const char* inFileName, bool gzip,
+ static bool ExtractTar(const char* inFileName,
bool verbose);
// This should be called first thing in main
// it will keep child processes from inheriting the
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index b30c8a6..27dd08b 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -765,7 +765,7 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
if ( flags.find_first_of('t') != flags.npos )
{
-if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
+if ( !cmSystemTools::ListTar(outFile.c_str(), verbose) )
{
cmSystemTools::Error(Problem creating tar: , outFile.c_str());
return 1;
@@ -783,7 +783,7 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
else if ( flags.find_first_of('x') != flags.npos )
{
if ( !cmSystemTools::ExtractTar(
-outFile.c_str(), gzip, verbose) )
+outFile.c_str(), verbose) )
{
cmSystemTools::Error(Problem extracting tar: , outFile.c_str());
return 1;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=312ac7257eacbe909f0544a8e9bce3f11f404a26
commit 312ac7257eacbe909f0544a8e9bce3f11f404a26
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 10:33:36 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 12:05:47 2015 -0500
cmake -E tar: error out on multiple compression formats
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index f7bb20e..b30c8a6 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -736,17 +736,27 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
cmSystemTools::cmTarCompression compress =
cmSystemTools::TarCompressNone;
bool verbose = false;
+ int nCompress = 0;
if ( flags.find_first_of('j') != flags.npos )
{
compress = cmSystemTools::TarCompressBZip2
[Cmake-commits] CMake branch, next, updated. v3.1.0-1623-g5f33228
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 5f3322884cc5903d3198f760191e2990c361330d (commit)
via f6de0b5eb61b389758505ccdeb2005b35cfc0a7e (commit)
via 0d3deaa1147303b30fc4e5339ecab36f2df62264 (commit)
from a9adf6ad4b1300a805dca29fe8e09d4db3c9fd73 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f3322884cc5903d3198f760191e2990c361330d
commit 5f3322884cc5903d3198f760191e2990c361330d
Merge: a9adf6a f6de0b5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 12:05:26 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 9 12:05:26 2015 -0500
Merge topic 'add-xz-support' into next
f6de0b5e fixup! cmSystemTools: use an enumeration for compression formats
0d3deaa1 cmSystemTools: remove unused gzip argument
diff --cc Source/cmcmd.cxx
index a3f0099,27dd08b..70d98d2
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@@ -764,9 -765,9 +765,9 @@@ int cmcmd::ExecuteCMakeCommand(std::vec
if ( flags.find_first_of('t') != flags.npos )
{
- if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
+ if ( !cmSystemTools::ListTar(outFile.c_str(), verbose) )
{
- cmSystemTools::Error(Problem creating tar: , outFile.c_str());
+ cmSystemTools::Error(Problem listing tar: , outFile.c_str());
return 1;
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6de0b5eb61b389758505ccdeb2005b35cfc0a7e
commit f6de0b5eb61b389758505ccdeb2005b35cfc0a7e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 12:05:19 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 12:05:19 2015 -0500
fixup! cmSystemTools: use an enumeration for compression formats
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5fc4823..27dd08b 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -735,6 +735,7 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
}
cmSystemTools::cmTarCompression compress =
cmSystemTools::TarCompressNone;
+ bool verbose = false;
int nCompress = 0;
if ( flags.find_first_of('j') != flags.npos )
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d3deaa1147303b30fc4e5339ecab36f2df62264
commit 0d3deaa1147303b30fc4e5339ecab36f2df62264
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Jan 9 12:04:56 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Jan 9 12:04:56 2015 -0500
cmSystemTools: remove unused gzip argument
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 036e859..0271665 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1800,7 +1800,7 @@ bool extract_tar(const char* outFileName, bool verbose,
#endif
bool cmSystemTools::ExtractTar(const char* outFileName,
- bool , bool verbose)
+ bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
return extract_tar(outFileName, verbose, true);
@@ -1812,7 +1812,6 @@ bool cmSystemTools::ExtractTar(const char* outFileName,
}
bool cmSystemTools::ListTar(const char* outFileName,
-bool ,
bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ad269b1..09ceea6 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -391,11 +391,11 @@ public:
TarCompressNone
};
static bool ListTar(const char* outFileName,
- bool gzip, bool verbose);
+ bool verbose);
static bool CreateTar(const char* outFileName,
const std::vectorstd::string files,
cmTarCompression compressType, bool verbose);
- static bool ExtractTar(const char* inFileName, bool gzip,
+ static bool ExtractTar(const char* inFileName,
bool verbose);
// This should be called first thing in main
// it will keep child processes from inheriting the
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 1bfbb55..5fc4823 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -764,7 +764,7 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
if ( flags.find_first_of('t') != flags.npos )
{
-if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
+if ( !cmSystemTools::ListTar(outFile.c_str(), verbose) )
{
cmSystemTools::Error(Problem creating tar
[Cmake-commits] CMake branch, next, updated. v3.1.0-1581-gfb08194
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 fb08194fa34fa33379de6c01cf72278d1da4bf90 (commit)
via 9ec446a86e5049ead95f35208f8844a5b1c817d5 (commit)
via 95b3b096474932430f04433fc61a422239333b02 (commit)
via bfc4b17aeb9fa6d2843f655052ac2c1a563bc25f (commit)
via 5008f9da62218ba204dc0f1161d8ef39307fe061 (commit)
from 7f218113baea90ff726b2f72be85242d038a60ba (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb08194fa34fa33379de6c01cf72278d1da4bf90
commit fb08194fa34fa33379de6c01cf72278d1da4bf90
Merge: 7f21811 9ec446a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jan 8 16:55:37 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 8 16:55:37 2015 -0500
Merge topic 'fix-empty-target-property-queries' into next
9ec446a8 tests: add tests for querying properties
95b3b096 set_tests_properties: fix documentation
bfc4b17a get_test_property: clarify the documentation
5008f9da cmGetTargetPropertyCommand: discern empty from undefined properties
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ec446a86e5049ead95f35208f8844a5b1c817d5
commit 9ec446a86e5049ead95f35208f8844a5b1c817d5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jan 8 15:27:46 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jan 8 16:33:31 2015 -0500
tests: add tests for querying properties
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b5e41d9..05c51cc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -173,3 +173,4 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
+add_RunCMake_test(get_property)
diff --git a/Tests/RunCMake/get_property/CMakeLists.txt
b/Tests/RunCMake/get_property/CMakeLists.txt
new file mode 100644
index 000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/get_property/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/get_property/RunCMakeTest.cmake
b/Tests/RunCMake/get_property/RunCMakeTest.cmake
new file mode 100644
index 000..e5700a2
--- /dev/null
+++ b/Tests/RunCMake/get_property/RunCMakeTest.cmake
@@ -0,0 +1,9 @@
+include(RunCMake)
+
+#run_cmake(cache_properties)
+run_cmake(directory_properties)
+run_cmake(global_properties)
+run_cmake(install_properties)
+run_cmake(source_properties)
+run_cmake(target_properties)
+run_cmake(test_properties)
diff --git a/Tests/RunCMake/get_property/cache_properties-stderr.txt
b/Tests/RunCMake/get_property/cache_properties-stderr.txt
new file mode 100644
index 000..b1a2987
--- /dev/null
+++ b/Tests/RunCMake/get_property/cache_properties-stderr.txt
@@ -0,0 +1,3 @@
+^get_property:
+get_property: --value--
+get_property: $
diff --git a/Tests/RunCMake/get_property/cache_properties.cmake
b/Tests/RunCMake/get_property/cache_properties.cmake
new file mode 100644
index 000..e41adfd
--- /dev/null
+++ b/Tests/RunCMake/get_property/cache_properties.cmake
@@ -0,0 +1,14 @@
+function (check_cache_property var prop)
+ get_property(gp_val
+CACHE ${var}
+PROPERTY ${prop})
+
+ message(get_property: --${gp_val}--)
+endfunction ()
+
+set(var val CACHE STRING doc)
+set_property(CACHE var PROPERTY empty custom value)
+
+check_cache_property(var empty)
+check_cache_property(var custom)
+check_cache_property(var noexist)
diff --git a/Tests/RunCMake/get_property/directory_properties-stderr.txt
b/Tests/RunCMake/get_property/directory_properties-stderr.txt
new file mode 100644
index 000..80c9877
--- /dev/null
+++ b/Tests/RunCMake/get_property/directory_properties-stderr.txt
@@ -0,0 +1,6 @@
+^get_directory_property:
+get_property:
+get_directory_property: --value--
+get_property: --value--
+get_directory_property:
+get_property: $
diff --git a/Tests/RunCMake/get_property/directory_properties.cmake
b/Tests/RunCMake/get_property/directory_properties.cmake
new file mode 100644
index 000..b0a9b1b
--- /dev/null
+++ b/Tests/RunCMake/get_property/directory_properties.cmake
@@ -0,0 +1,15 @@
+function (check_directory_property dir prop)
+ get_directory_property(gdp_val DIRECTORY ${dir} ${prop})
+ get_property(gp_val
+DIRECTORY ${dir}
+PROPERTY ${prop})
+
+ message(get_directory_property: --${gdp_val}--)
+ message(get_property: --${gp_val}--)
+endfunction ()
+
+set_directory_properties(PROPERTIES empty custom value
[Cmake-commits] CMake branch, next, updated. v3.1.0-1584-g9ee6a71
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 9ee6a717826db91829196a59e02bcf73d216bf87 (commit)
via dd94f7c8233489388b5aea6418bfb8002ab855cc (commit)
via b0a5d3932d2a6633d05eca3eb7fd632f433dca05 (commit)
from fb08194fa34fa33379de6c01cf72278d1da4bf90 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ee6a717826db91829196a59e02bcf73d216bf87
commit 9ee6a717826db91829196a59e02bcf73d216bf87
Merge: fb08194 dd94f7c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jan 8 16:59:52 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 8 16:59:52 2015 -0500
Merge topic 'add-xz-support' into next
dd94f7c8 cmake -E tar: add support for .xz files with 'J'
b0a5d393 cmake -E tar: clean up flag documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd94f7c8233489388b5aea6418bfb8002ab855cc
commit dd94f7c8233489388b5aea6418bfb8002ab855cc
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jan 8 16:56:33 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jan 8 16:59:36 2015 -0500
cmake -E tar: add support for .xz files with 'J'
diff --git a/Help/release/dev/add-xz-support.rst
b/Help/release/dev/add-xz-support.rst
new file mode 100644
index 000..0dcea9c
--- /dev/null
+++ b/Help/release/dev/add-xz-support.rst
@@ -0,0 +1,5 @@
+add-xz-support
+--
+
+The :manual:`cmake(1)` ``-E tar`` command now supports creating
+``.xz``-compressed archives with the ``J`` flag.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 80dbaf3..f02d78e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1674,7 +1674,8 @@ std::string cmCTest::Base64GzipEncodeFile(std::string
file)
std::vectorstd::string files;
files.push_back(file);
- if(!cmSystemTools::CreateTar(tarFile.c_str(), files, true, false, false))
+ if(!cmSystemTools::CreateTar(tarFile.c_str(), files,
+ true, false, false, false))
{
cmCTestLog(this, ERROR_MESSAGE, Error creating tar while
encoding file: file std::endl);
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 1c8c387..cd63347 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1482,7 +1482,8 @@ bool cmSystemTools::IsPathToFramework(const char* path)
bool cmSystemTools::CreateTar(const char* outFileName,
const std::vectorstd::string files,
- bool gzip, bool bzip2, bool verbose)
+ bool gzip, bool bzip2, bool xz,
+ bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
@@ -1498,7 +1499,8 @@ bool cmSystemTools::CreateTar(const char* outFileName,
}
cmArchiveWrite a(fout, (gzip? cmArchiveWrite::CompressGZip :
(bzip2? cmArchiveWrite::CompressBZip2 :
- cmArchiveWrite::CompressNone)),
+ (xz? cmArchiveWrite::CompressXZ :
+ cmArchiveWrite::CompressNone))),
cmArchiveWrite::TypeTAR);
a.SetVerbose(verbose);
for(std::vectorstd::string::const_iterator i = files.begin();
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index d49af74..47d2771 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -387,7 +387,7 @@ public:
bool gzip, bool verbose);
static bool CreateTar(const char* outFileName,
const std::vectorstd::string files, bool gzip,
-bool bzip2, bool verbose);
+bool bzip2, bool xz, bool verbose);
static bool ExtractTar(const char* inFileName, bool gzip,
bool verbose);
// This should be called first thing in main
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index f2f028a..6b3efb5 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -71,7 +71,7 @@ void CMakeCommandUsage(const char* program)
remove_directory dir - remove a directory and its contents\n
rename oldname newname- rename a file or directory
(on one volume)\n
- tar [cxt][vf][zj] file.tar [file/dir1 file/dir2 ...]\n
+ tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n
- create or extract a tar or zip archive\n
sleep number... - sleep for given number of seconds\n
time command [args] ... - run command and return elapsed time\n
[Cmake-commits] CMake branch, next, updated. v3.1.0-1506-g007b045
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 007b0452b5f7e536f1f88b30bcc5331227cbb098 (commit)
via ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d (commit)
via 827243942c3568bbb621c4009c8f03fdd0ba71f7 (commit)
via 73144c098d8b176bb99b762450b9b231687011b8 (commit)
from be2007b08096c2ca1323141d07811f8018151e24 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=007b0452b5f7e536f1f88b30bcc5331227cbb098
commit 007b0452b5f7e536f1f88b30bcc5331227cbb098
Merge: be2007b ab4d1d0
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jan 6 12:59:40 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jan 6 12:59:40 2015 -0500
Merge topic 'find-msmpi' into next
ab4d1d07 FindMPI: MSMPI changed the subdirectories it uses
82724394 FindMPI: add more search paths for MSMPI
73144c09 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d
commit ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jan 6 12:58:31 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jan 6 12:59:07 2015 -0500
FindMPI: MSMPI changed the subdirectories it uses
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 672c65d..9192054 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -426,16 +426,18 @@ function (interrogate_mpi_compiler lang try_libs)
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-set(MS_MPI_ARCH_DIR amd64)
+set(MS_MPI_ARCH_DIR x64)
+set(MS_MPI_ARCH_DIR2 amd64)
else()
-set(MS_MPI_ARCH_DIR i386)
+set(MS_MPI_ARCH_DIR x86)
+set(MS_MPI_ARCH_DIR2 i386)
endif()
set(MPI_LIB MPI_LIB-NOTFOUND CACHE FILEPATH Cleared FORCE)
find_library(MPI_LIB
NAMES mpi mpich mpich2 msmpi
HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
-PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
+PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
Lib/${MS_MPI_ARCH_DIR2})
set(MPI_LIBRARIES_WORK ${MPI_LIB})
# Right now, we only know about the extra libs for C++.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=827243942c3568bbb621c4009c8f03fdd0ba71f7
commit 827243942c3568bbb621c4009c8f03fdd0ba71f7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jan 6 12:58:07 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jan 6 12:58:07 2015 -0500
FindMPI: add more search paths for MSMPI
Also comment what the various search paths are for.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 8e39a7f..672c65d 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -174,7 +174,11 @@ set(_MPI_EXEC_NAMESmpiexec mpirun
lamexec srun)
# Grab the path to MPI from the registry if we're on windows.
set(_MPI_PREFIX_PATH)
if(WIN32)
+ # MSMPI
+ list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_BIN})
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin)
+ list(APPEND _MPI_PREFIX_PATH $ENV{MSMPI_INC}/..) # The SDK is installed
separately from the runtime
+ # MPICH
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..)
list(APPEND _MPI_PREFIX_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path])
list(APPEND _MPI_PREFIX_PATH $ENV{ProgramW6432}/MPICH2/)
---
Summary of changes:
Modules/FindMPI.cmake | 12 +---
Source/CMakeVersion.cmake |2 +-
2 files changed, 10 insertions(+), 4 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.1.0-1502-gbe2007b
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 be2007b08096c2ca1323141d07811f8018151e24 (commit)
via c4e743674f3f7c576ff90cacae6465e7e171faed (commit)
via 4b70635c9fe9b4425db275c2ed3be1b5223ebe4b (commit)
via 592dd355705ba0b22f33d48c2e0b5ff0e2a471d8 (commit)
from 56054b1982748475a350239ae42d99af0554242a (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2007b08096c2ca1323141d07811f8018151e24
commit be2007b08096c2ca1323141d07811f8018151e24
Merge: 56054b1 c4e7436
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 5 13:54:25 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 5 13:54:25 2015 -0500
Merge topic 'fix-error-message-typo-tar-cmd' into next
c4e74367 cmcmd: fix copy/paste typo in '-E tar t' command
4b70635c CMake Nightly Date Stamp
592dd355 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4e743674f3f7c576ff90cacae6465e7e171faed
commit c4e743674f3f7c576ff90cacae6465e7e171faed
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jan 5 13:53:53 2015 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jan 5 13:53:53 2015 -0500
cmcmd: fix copy/paste typo in '-E tar t' command
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index a97444d..37d2916 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -753,7 +753,7 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
{
if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
{
- cmSystemTools::Error(Problem creating tar: , outFile.c_str());
+ cmSystemTools::Error(Problem listing tar: , outFile.c_str());
return 1;
}
}
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmcmd.cxx |2 +-
2 files changed, 2 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.1.0-rc3-1157-gd42fb10
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 d42fb107b932f29001ba2ac362c2fee319c8c55a (commit)
via a300d0ff0fbec17360113f9bb1c09e9efab19792 (commit)
from 0154b576c4d9bcf98d0ee3964110cd684ba95241 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d42fb107b932f29001ba2ac362c2fee319c8c55a
commit d42fb107b932f29001ba2ac362c2fee319c8c55a
Merge: 0154b57 a300d0f
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Dec 12 18:35:48 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 12 18:35:48 2014 -0500
Merge topic 'cmp0054-warnings-extproj' into next
a300d0ff ExternalProject: avoid CMP0054 warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a300d0ff0fbec17360113f9bb1c09e9efab19792
commit a300d0ff0fbec17360113f9bb1c09e9efab19792
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Fri Dec 12 18:30:00 2014 -0500
Commit: Ben Boeckel maths...@gmail.com
CommitDate: Fri Dec 12 18:30:00 2014 -0500
ExternalProject: avoid CMP0054 warnings
Found where ${command} is make which is a local variable.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7e4cc37..a11055b 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1241,7 +1241,7 @@ function(_ep_write_log_script name step cmd_var)
set(make )
set(code_cygpath_make )
- if(${command} MATCHES ^\\$\\(MAKE\\))
+ if(command MATCHES ^\\$\\(MAKE\\))
# GNU make recognizes the string $(MAKE) as recursive make, so
# ensure that it appears directly in the makefile.
string(REGEX REPLACE ^\\$\\(MAKE\\) \${make} command ${command})
@@ -1273,7 +1273,7 @@ endif()
# Wrap multiple 'COMMAND' lines up into a second-level wrapper
# script so all output can be sent to one log file.
- if(${command} MATCHES ;COMMAND;)
+ if(command MATCHES ;COMMAND;)
set(code_execute_process
${code_cygpath_make}
execute_process(COMMAND \${command} RESULT_VARIABLE result)
---
Summary of changes:
Modules/ExternalProject.cmake |4 ++--
1 file changed, 2 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.1.0-rc3-1159-gd246327
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 d2463278c7760710e1c1913d0332e31fa8f50740 (commit)
via 480e60298f862e0c1942b6e028e509f81b9ab71e (commit)
from d42fb107b932f29001ba2ac362c2fee319c8c55a (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2463278c7760710e1c1913d0332e31fa8f50740
commit d2463278c7760710e1c1913d0332e31fa8f50740
Merge: d42fb10 480e602
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Dec 12 18:44:17 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 12 18:44:17 2014 -0500
Merge topic 'extproj-extra-newlines' into next
480e6029 ExternalProject: remove extra newlines from log messages
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480e60298f862e0c1942b6e028e509f81b9ab71e
commit 480e60298f862e0c1942b6e028e509f81b9ab71e
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Fri Dec 12 18:42:33 2014 -0500
Commit: Ben Boeckel maths...@gmail.com
CommitDate: Fri Dec 12 18:42:33 2014 -0500
ExternalProject: remove extra newlines from log messages
message() already adds a newline.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7e4cc37..98ff716 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1320,10 +1320,10 @@ if(result)
foreach(arg IN LISTS command)
set(msg \\${msg} '\${arg}'\)
endforeach()
- set(msg \\${msg}\\nSee also\\n ${logbase}-*.log\\n\)
+ set(msg \\${msg}\\nSee also\\n ${logbase}-*.log\)
message(FATAL_ERROR \\${msg}\)
else()
- set(msg \${name} ${step} command succeeded. See also ${logbase}-*.log\\n\)
+ set(msg \${name} ${step} command succeeded. See also ${logbase}-*.log\)
message(STATUS \\${msg}\)
endif()
)
---
Summary of changes:
Modules/ExternalProject.cmake |4 ++--
1 file changed, 2 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.1.0-rc3-1128-g265a5f4
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 265a5f4ec38c933cbb7212568ce5a3813e50e42d (commit)
via 17a846ac3e8d0fab4bb99e238dbe867941594465 (commit)
from 21d155f0cb279724c595f2ea8fcb0ceda6bce41d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=265a5f4ec38c933cbb7212568ce5a3813e50e42d
commit 265a5f4ec38c933cbb7212568ce5a3813e50e42d
Merge: 21d155f 17a846a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Dec 11 17:30:03 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Dec 11 17:30:03 2014 -0500
Merge topic 'find-msmpi' into next
17a846ac FindMPI: search for msmpi's mpiexec as well
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a846ac3e8d0fab4bb99e238dbe867941594465
commit 17a846ac3e8d0fab4bb99e238dbe867941594465
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Dec 11 17:26:06 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Dec 11 17:26:06 2014 -0500
FindMPI: search for msmpi's mpiexec as well
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6f6dcf3..0508579 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -174,6 +174,7 @@ set(_MPI_EXEC_NAMESmpiexec mpirun
lamexec srun)
# Grab the path to MPI from the registry if we're on windows.
set(_MPI_PREFIX_PATH)
if(WIN32)
+ list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin)
list(APPEND _MPI_PREFIX_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..)
list(APPEND _MPI_PREFIX_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path])
list(APPEND _MPI_PREFIX_PATH $ENV{ProgramW6432}/MPICH2/)
---
Summary of changes:
Modules/FindMPI.cmake |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.1.0-rc3-1120-g9a91d8a
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 9a91d8a80855a5db8446f73c527c28aecdf17ee3 (commit)
via d8589e6437451ef174fc480d0dfc4e83e49b1b30 (commit)
from 9bb68ece44b1aa88e5bb0fbf2f053e96a2fc5a57 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a91d8a80855a5db8446f73c527c28aecdf17ee3
commit 9a91d8a80855a5db8446f73c527c28aecdf17ee3
Merge: 9bb68ec d8589e6
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Dec 10 17:24:13 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 10 17:24:13 2014 -0500
Merge topic 'catch-ctest-errors-better' into next
d8589e64 ctest: count errors from scripts properly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8589e6437451ef174fc480d0dfc4e83e49b1b30
commit d8589e6437451ef174fc480d0dfc4e83e49b1b30
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Dec 10 17:22:21 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Dec 10 17:22:21 2014 -0500
ctest: count errors from scripts properly
In the unlikely event that someone has a billion+ scripts (or some
codepath returns negative numbers), we could overflow and make a pile of
errors a non-error. This change also allows us to use flags for the
error in the future rather than just something went wrong.
diff --git a/Source/CTest/cmCTestScriptHandler.cxx
b/Source/CTest/cmCTestScriptHandler.cxx
index 749eb58..f958e7b 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -183,7 +183,7 @@ int cmCTestScriptHandler::ProcessHandler()
for (size_t i=0; i this-ConfigurationScripts.size(); ++i)
{
// for each script run it
-res += this-RunConfigurationScript
+res |= this-RunConfigurationScript
(cmSystemTools::CollapseFullPath(this-ConfigurationScripts[i]),
this-ScriptProcessScope[i]);
}
---
Summary of changes:
Source/CTest/cmCTestScriptHandler.cxx |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.1.0-rc2-1071-gacbb292
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 acbb29284941bd549fa9fd713dac9e50ceb6e58c (commit)
via 82d7acb3cf014a9760341363a8e652e7a1440d21 (commit)
from a9d6a0926705062ac183f8fab1cfa14b900a70b4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acbb29284941bd549fa9fd713dac9e50ceb6e58c
commit acbb29284941bd549fa9fd713dac9e50ceb6e58c
Merge: a9d6a09 82d7acb
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Dec 3 11:06:40 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 3 11:06:40 2014 -0500
Merge topic 'cached-regex-clear-fixed' into next
82d7acb3 fixup! cmMakefile: store the number of last matches in a CMake var
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82d7acb3cf014a9760341363a8e652e7a1440d21
commit 82d7acb3cf014a9760341363a8e652e7a1440d21
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Dec 3 11:06:25 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Dec 3 11:06:25 2014 -0500
fixup! cmMakefile: store the number of last matches in a CMake var
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 24e65d7..a7acc27 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4891,7 +4891,7 @@ void cmMakefile::StoreMatches(cmsys::RegularExpression
re)
std::string const var = matchVariables[i];
this-AddDefinition(var, m.c_str());
this-MarkVariableAsUsed(var);
- highest = '0' + i;
+ highest = static_castchar('0' + i);
}
}
char nMatches[] = {highest, '\0'};
---
Summary of changes:
Source/cmMakefile.cxx |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.1.0-rc2-1017-gd3e8937
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 d3e89373cca5afb50cdf04f4fba087daa8c70fa4 (commit)
via a8a2fde198926b3bac40f34f510fdc821d51e8a4 (commit)
via 65b164123edf4edaa74c7a0fdd6852f49d098f7c (commit)
from 6e7305e92f0ddedfe6eedb475d2eafb3f208d26b (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3e89373cca5afb50cdf04f4fba087daa8c70fa4
commit d3e89373cca5afb50cdf04f4fba087daa8c70fa4
Merge: 6e7305e a8a2fde
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 2 11:45:28 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 2 11:45:28 2014 -0500
Merge topic 'cached-regex-clear-fixed' into next
a8a2fde1 fixup! cmMakefile: store the number of last matches in a CMake var
65b16412 fixup! test: add a test for clearing regex results
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8a2fde198926b3bac40f34f510fdc821d51e8a4
commit a8a2fde198926b3bac40f34f510fdc821d51e8a4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 2 11:34:08 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Dec 2 11:45:14 2014 -0500
fixup! cmMakefile: store the number of last matches in a CMake var
diff --git a/Help/release/dev/cached-regex-clear-fixed.rst
b/Help/release/dev/cached-regex-clear-fixed.rst
new file mode 100644
index 000..fbf08cc
--- /dev/null
+++ b/Help/release/dev/cached-regex-clear-fixed.rst
@@ -0,0 +1,5 @@
+cached-regex-clear-fixed
+
+
+* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
+ regular expression.
diff --git a/Help/variable/CMAKE_MATCH_COUNT.rst
b/Help/variable/CMAKE_MATCH_COUNT.rst
index 4f7b9ab..8b1c036 100644
--- a/Help/variable/CMAKE_MATCH_COUNT.rst
+++ b/Help/variable/CMAKE_MATCH_COUNT.rst
@@ -3,6 +3,6 @@ CMAKE_MATCH_COUNT
The number of matches with the last regular expression.
-When a regular expression match is used, CMake fills in `CMAKE_MATCH_n`
-variables with the match contents. The `CMAKE_MATCH_COUNT` variable holds the
-number of match expressions when these are filled.
+When a regular expression match is used, CMake fills in ``CMAKE_MATCH_n``
+variables with the match contents. The ``CMAKE_MATCH_COUNT`` variable holds
+the number of match expressions when these are filled.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2a8bbd4..24e65d7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4841,7 +4841,7 @@ std::vectorcmSourceFile*
cmMakefile::GetQtUiFilesWithOptions() const
return this-QtUiFilesWithOptions;
}
-static std::string matchVariables[] = {
+static std::string const matchVariables[] = {
CMAKE_MATCH_0,
CMAKE_MATCH_1,
CMAKE_MATCH_2,
@@ -4854,7 +4854,7 @@ static std::string matchVariables[] = {
CMAKE_MATCH_9
};
-static std::string nMatchesVariable = CMAKE_MATCH_COUNT;
+static std::string const nMatchesVariable = CMAKE_MATCH_COUNT;
//
void cmMakefile::ClearMatches()
@@ -4865,7 +4865,7 @@ void cmMakefile::ClearMatches()
return;
}
int nMatches = atoi(nMatchesStr);
- for (int i=0; inMatches; i++)
+ for (int i=0; i=nMatches; i++)
{
std::string const var = matchVariables[i];
std::string const s = this-GetSafeDefinition(var);
@@ -4883,7 +4883,7 @@ void cmMakefile::ClearMatches()
void cmMakefile::StoreMatches(cmsys::RegularExpression re)
{
char highest = 0;
- for (unsigned int i=0; i10; i++)
+ for (int i=0; i10; i++)
{
std::string const m = re.match(i);
if(!m.empty())
@@ -4891,7 +4891,7 @@ void cmMakefile::StoreMatches(cmsys::RegularExpression
re)
std::string const var = matchVariables[i];
this-AddDefinition(var, m.c_str());
this-MarkVariableAsUsed(var);
- highest = '0' + i + 1;
+ highest = '0' + i;
}
}
char nMatches[] = {highest, '\0'};
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65b164123edf4edaa74c7a0fdd6852f49d098f7c
commit 65b164123edf4edaa74c7a0fdd6852f49d098f7c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 2 11:32:11 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Dec 2 11:44:14 2014 -0500
fixup! test: add a test for clearing regex results
diff --git a/Tests/RegexClear/CMakeLists.txt b/Tests/RegexClear/CMakeLists.txt
deleted file mode 100644
index 5911b42..000
--- a/Tests/RegexClear/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-cmake_minimum_required (VERSION 3.0)
-project (RegexClear C)
-
-function
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1020-gf877254
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 f877254b91e3a02544999020cd64baa6db8e7e56 (commit)
via 63e53d45191fe3ea196112fa7bd2dba6b24e188f (commit)
via f9dbfe2687a96242d86073fbbda18012ceef9d79 (commit)
from d3e89373cca5afb50cdf04f4fba087daa8c70fa4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f877254b91e3a02544999020cd64baa6db8e7e56
commit f877254b91e3a02544999020cd64baa6db8e7e56
Merge: d3e8937 63e53d4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Dec 2 11:45:48 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 2 11:45:48 2014 -0500
Merge topic 'cached-regex-clear-fixed' into next
63e53d45 cmMakefile: store the number of last matches in a CMake var
f9dbfe26 test: add a test for clearing regex results
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63e53d45191fe3ea196112fa7bd2dba6b24e188f
commit 63e53d45191fe3ea196112fa7bd2dba6b24e188f
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 10:51:49 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Dec 2 11:45:33 2014 -0500
cmMakefile: store the number of last matches in a CMake var
With PushScope and PopScope, keeping track of another bit of data for
each scope isn't easy. Instead, store it as another CMake variable so it
gets implicitly tracked along with everything else.
This works in a revert of commit
7d674b5f0b28a610333644d417c2e8cb796cc9e4.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 99088e0..2de4103 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -47,6 +47,7 @@ Variables that Provide Information
/variable/CMAKE_LINK_LIBRARY_SUFFIX
/variable/CMAKE_MAJOR_VERSION
/variable/CMAKE_MAKE_PROGRAM
+ /variable/CMAKE_MATCH_COUNT
/variable/CMAKE_MINIMUM_REQUIRED_VERSION
/variable/CMAKE_MINOR_VERSION
/variable/CMAKE_PARENT_LIST_FILE
diff --git a/Help/release/dev/cached-regex-clear-fixed.rst
b/Help/release/dev/cached-regex-clear-fixed.rst
new file mode 100644
index 000..fbf08cc
--- /dev/null
+++ b/Help/release/dev/cached-regex-clear-fixed.rst
@@ -0,0 +1,5 @@
+cached-regex-clear-fixed
+
+
+* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
+ regular expression.
diff --git a/Help/variable/CMAKE_MATCH_COUNT.rst
b/Help/variable/CMAKE_MATCH_COUNT.rst
new file mode 100644
index 000..8b1c036
--- /dev/null
+++ b/Help/variable/CMAKE_MATCH_COUNT.rst
@@ -0,0 +1,8 @@
+CMAKE_MATCH_COUNT
+-
+
+The number of matches with the last regular expression.
+
+When a regular expression match is used, CMake fills in ``CMAKE_MATCH_n``
+variables with the match contents. The ``CMAKE_MATCH_COUNT`` variable holds
+the number of match expressions when these are filled.
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 6065b8a..aba26de 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,7 +11,6 @@
*/
#include cmConditionEvaluator.h
-#include cmStringCommand.h
cmConditionEvaluator::cmConditionEvaluator(cmMakefile makefile):
Makefile(makefile),
@@ -556,7 +555,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList
newArgs,
{
def = this-GetVariableOrString(*arg);
const char* rex = argP2-c_str();
-cmStringCommand::ClearMatches(this-Makefile);
+this-Makefile.ClearMatches();
cmsys::RegularExpression regEntry;
if ( !regEntry.compile(rex) )
{
@@ -568,7 +567,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList
newArgs,
}
if (regEntry.find(def))
{
- cmStringCommand::StoreMatches(this-Makefile, regEntry);
+ this-Makefile.StoreMatches(regEntry);
*arg = cmExpandedCommandArgument(1, true);
}
else
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 53fd56f..24e65d7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4841,6 +4841,64 @@ std::vectorcmSourceFile*
cmMakefile::GetQtUiFilesWithOptions() const
return this-QtUiFilesWithOptions;
}
+static std::string const matchVariables[] = {
+ CMAKE_MATCH_0,
+ CMAKE_MATCH_1,
+ CMAKE_MATCH_2,
+ CMAKE_MATCH_3,
+ CMAKE_MATCH_4,
+ CMAKE_MATCH_5,
+ CMAKE_MATCH_6,
+ CMAKE_MATCH_7,
+ CMAKE_MATCH_8,
+ CMAKE_MATCH_9
+};
+
+static std::string const
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1022-g7b53ae4
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 7b53ae4cda37d9df6f9653e8203da610be1ea4a7 (commit) via c9a46aa4a57580841525a231a37ef47c49374491 (commit) from f877254b91e3a02544999020cd64baa6db8e7e56 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b53ae4cda37d9df6f9653e8203da610be1ea4a7 commit 7b53ae4cda37d9df6f9653e8203da610be1ea4a7 Merge: f877254 c9a46aa Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Dec 2 13:50:58 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 2 13:50:58 2014 -0500 Merge topic 'cached-regex-clear-fixed' into next c9a46aa4 fixup! test: add a test for clearing regex results http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9a46aa4a57580841525a231a37ef47c49374491 commit c9a46aa4a57580841525a231a37ef47c49374491 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Tue Dec 2 13:50:49 2014 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Tue Dec 2 13:50:49 2014 -0500 fixup! test: add a test for clearing regex results diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6ed3f0a..c9d9568 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -271,7 +271,6 @@ if(BUILD_TESTING) ADD_TEST_MACRO(MacroTest miniMacroTest) ADD_TEST_MACRO(FunctionTest miniFunctionTest) ADD_TEST_MACRO(ReturnTest ReturnTest) - ADD_TEST_MACRO(RegexClear RegexClear) ADD_TEST_MACRO(Properties Properties) ADD_TEST_MACRO(Assembler HelloAsm) ADD_TEST_MACRO(SourceGroups SourceGroups) diff --git a/Tests/RunCMake/string/RegexClear-stderr.txt b/Tests/RunCMake/string/RegexClear-stderr.txt new file mode 100644 index 000..22b0159 --- /dev/null +++ b/Tests/RunCMake/string/RegexClear-stderr.txt @@ -0,0 +1,54 @@ +^Matched string properly +results from: setting up initial state +CMAKE_MATCH_0: --01-- +CMAKE_MATCH_1: --0-- +CMAKE_MATCH_2: --1-- +CMAKE_MATCH_COUNT: --2-- +Matched string properly +results from: making a match inside of find_package +CMAKE_MATCH_0: --01-- +CMAKE_MATCH_1: --0-- +CMAKE_MATCH_2: --1-- +CMAKE_MATCH_COUNT: --2-- +Matched nothing properly +results from: making a failure inside of find_package +CMAKE_MATCH_0: +CMAKE_MATCH_1: +CMAKE_MATCH_2: +CMAKE_MATCH_COUNT: --0-- +Matched nothing properly +results from: checking after find_package +CMAKE_MATCH_0: +CMAKE_MATCH_1: +CMAKE_MATCH_2: +CMAKE_MATCH_COUNT: --0-- +Matched nothing properly +results from: clearing out results with a failing match +CMAKE_MATCH_0: +CMAKE_MATCH_1: +CMAKE_MATCH_2: +CMAKE_MATCH_COUNT: --0-- +Matched string properly +results from: making a successful match before add_subdirectory +CMAKE_MATCH_0: --01-- +CMAKE_MATCH_1: --0-- +CMAKE_MATCH_2: --1-- +CMAKE_MATCH_COUNT: --2-- +Matched string properly +results from: check for success in add_subdirectory +CMAKE_MATCH_0: --01-- +CMAKE_MATCH_1: --0-- +CMAKE_MATCH_2: --1-- +CMAKE_MATCH_COUNT: --2-- +Matched nothing properly +results from: failing inside of add_subdirectory +CMAKE_MATCH_0: +CMAKE_MATCH_1: +CMAKE_MATCH_2: +CMAKE_MATCH_COUNT: --0-- +Matched string properly +results from: ensuring the subdirectory did not interfere with the parent +CMAKE_MATCH_0: --01-- +CMAKE_MATCH_1: --0-- +CMAKE_MATCH_2: --1-- +CMAKE_MATCH_COUNT: --2--$ --- Summary of changes: Tests/CMakeLists.txt|1 - Tests/RunCMake/string/RegexClear-stderr.txt | 54 +++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/string/RegexClear-stderr.txt 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.1.0-rc2-968-g120e11f
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 120e11fe8cde02a574eb972c8f98cfb6d7a67648 (commit)
via ae676e46af6dab626a76c61a7be8ddd158535fa2 (commit)
via 789d893af26dd8ef5e3a7de01b3a66767bb3b811 (commit)
from 21e224e818871f074ba134faed05409c36ad613b (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=120e11fe8cde02a574eb972c8f98cfb6d7a67648
commit 120e11fe8cde02a574eb972c8f98cfb6d7a67648
Merge: 21e224e ae676e4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 10:55:28 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 1 10:55:28 2014 -0500
Merge topic 'cached-regex-clear-fixed' into next
ae676e46 cmMakefile: store the number of last matches in a CMake var
789d893a test: add a test for clearing regex results
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae676e46af6dab626a76c61a7be8ddd158535fa2
commit ae676e46af6dab626a76c61a7be8ddd158535fa2
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 10:51:49 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Dec 1 10:55:15 2014 -0500
cmMakefile: store the number of last matches in a CMake var
With PushScope and PopScope, keeping track of another bit of data for
each scope isn't easy. Instead, store it as another CMake variable so it
gets implicitly tracked along with everything else.
This works in a revert of commit
7d674b5f0b28a610333644d417c2e8cb796cc9e4.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 99088e0..2de4103 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -47,6 +47,7 @@ Variables that Provide Information
/variable/CMAKE_LINK_LIBRARY_SUFFIX
/variable/CMAKE_MAJOR_VERSION
/variable/CMAKE_MAKE_PROGRAM
+ /variable/CMAKE_MATCH_COUNT
/variable/CMAKE_MINIMUM_REQUIRED_VERSION
/variable/CMAKE_MINOR_VERSION
/variable/CMAKE_PARENT_LIST_FILE
diff --git a/Help/variable/CMAKE_MATCH_COUNT.rst
b/Help/variable/CMAKE_MATCH_COUNT.rst
new file mode 100644
index 000..4f7b9ab
--- /dev/null
+++ b/Help/variable/CMAKE_MATCH_COUNT.rst
@@ -0,0 +1,8 @@
+CMAKE_MATCH_COUNT
+-
+
+The number of matches with the last regular expression.
+
+When a regular expression match is used, CMake fills in `CMAKE_MATCH_n`
+variables with the match contents. The `CMAKE_MATCH_COUNT` variable holds the
+number of match expressions when these are filled.
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 6065b8a..aba26de 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,7 +11,6 @@
*/
#include cmConditionEvaluator.h
-#include cmStringCommand.h
cmConditionEvaluator::cmConditionEvaluator(cmMakefile makefile):
Makefile(makefile),
@@ -556,7 +555,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList
newArgs,
{
def = this-GetVariableOrString(*arg);
const char* rex = argP2-c_str();
-cmStringCommand::ClearMatches(this-Makefile);
+this-Makefile.ClearMatches();
cmsys::RegularExpression regEntry;
if ( !regEntry.compile(rex) )
{
@@ -568,7 +567,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList
newArgs,
}
if (regEntry.find(def))
{
- cmStringCommand::StoreMatches(this-Makefile, regEntry);
+ this-Makefile.StoreMatches(regEntry);
*arg = cmExpandedCommandArgument(1, true);
}
else
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 53fd56f..2a8bbd4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4841,6 +4841,64 @@ std::vectorcmSourceFile*
cmMakefile::GetQtUiFilesWithOptions() const
return this-QtUiFilesWithOptions;
}
+static std::string matchVariables[] = {
+ CMAKE_MATCH_0,
+ CMAKE_MATCH_1,
+ CMAKE_MATCH_2,
+ CMAKE_MATCH_3,
+ CMAKE_MATCH_4,
+ CMAKE_MATCH_5,
+ CMAKE_MATCH_6,
+ CMAKE_MATCH_7,
+ CMAKE_MATCH_8,
+ CMAKE_MATCH_9
+};
+
+static std::string nMatchesVariable = CMAKE_MATCH_COUNT;
+
+//
+void cmMakefile::ClearMatches()
+{
+ const char* nMatchesStr = this-GetDefinition(nMatchesVariable);
+ if (!nMatchesStr)
+{
+return;
+}
+ int nMatches = atoi(nMatchesStr);
+ for (int i=0; inMatches; i++)
+{
+std::string const var = matchVariables[i];
+std::string
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-974-g14d771d
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 14d771da2db3edad9b47c7565de805fab0c50ccc (commit)
via 20bff46023c05ee2949aebdd8221c4a4c1289451 (commit)
from 1b1987b8d8d572da275cd0d028bfd19e66a7a6f7 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14d771da2db3edad9b47c7565de805fab0c50ccc
commit 14d771da2db3edad9b47c7565de805fab0c50ccc
Merge: 1b1987b 20bff46
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 12:57:25 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 1 12:57:25 2014 -0500
Merge topic 'xcode-target-search-perf' into next
20bff460 xcode: use a map to look up target pointers
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20bff46023c05ee2949aebdd8221c4a4c1289451
commit 20bff46023c05ee2949aebdd8221c4a4c1289451
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 12:56:46 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Dec 1 12:56:46 2014 -0500
xcode: use a map to look up target pointers
Rather than iterating over a vector, use a map to associate targets with
XCode objects.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b9f64e2..2dbc48c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2458,6 +2458,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget
cmtarget)
target-AddAttribute(name, this-CreateString(cmtarget.GetName()));
target-AddAttribute(productName,this-CreateString(cmtarget.GetName()));
target-SetTarget(cmtarget);
+ this-XCodeObjectMap[cmtarget] = target;
// Add source files without build rules for editing convenience.
if(cmtarget.GetType() == cmTarget::UTILITY)
@@ -2661,6 +2662,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget
cmtarget,
target-AddAttribute(productType, this-CreateString(productType));
}
target-SetTarget(cmtarget);
+ this-XCodeObjectMap[cmtarget] = target;
target-SetId(this-GetOrCreateId(
cmtarget.GetName(), target-GetId()).c_str());
return target;
@@ -2673,16 +2675,14 @@ cmXCodeObject*
cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
{
return 0;
}
- for(std::vectorcmXCodeObject*::iterator i = this-XCodeObjects.begin();
- i != this-XCodeObjects.end(); ++i)
+
+ std::mapcmTarget const*, cmXCodeObject*::const_iterator const i =
+this-XCodeObjectMap.find(t);
+ if (i == this-XCodeObjectMap.end())
{
-cmXCodeObject* o = *i;
-if(o-GetTarget() == t)
- {
- return o;
- }
+return 0;
}
- return 0;
+ return i-second;
}
//
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9d7b784..d2bc9d1 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -241,6 +241,7 @@ private:
std::mapstd::string, cmXCodeObject* GroupNameMap;
std::mapstd::string, cmXCodeObject* TargetGroup;
std::mapstd::string, cmXCodeObject* FileRefs;
+ std::mapcmTarget const*, cmXCodeObject* XCodeObjectMap;
std::vectorstd::string Architectures;
std::string GeneratorToolset;
};
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 16
Source/cmGlobalXCodeGenerator.h |1 +
2 files changed, 9 insertions(+), 8 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.1.0-rc2-976-g16ea4be
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 16ea4be99cf2460abbe432e82971ba14816867a2 (commit)
via 6c9d33562560333c123899c8ff3d2cd47fe386a1 (commit)
from 14d771da2db3edad9b47c7565de805fab0c50ccc (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ea4be99cf2460abbe432e82971ba14816867a2
commit 16ea4be99cf2460abbe432e82971ba14816867a2
Merge: 14d771d 6c9d335
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Dec 1 12:57:51 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 1 12:57:51 2014 -0500
Merge topic 'icase-source-file-prop' into next
6c9d3356 test: test source file properties with case-insensitivity
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c9d33562560333c123899c8ff3d2cd47fe386a1
commit 6c9d33562560333c123899c8ff3d2cd47fe386a1
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Nov 21 13:21:55 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Dec 1 12:57:41 2014 -0500
test: test source file properties with case-insensitivity
Some filesystems are case insensitive, so when setting properties on the
files, this should be respected (modulo a policy decision).
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c9d9568..fda9359 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -291,6 +291,7 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(ConfigSources ConfigSources)
endif()
ADD_TEST_MACRO(SourcesProperty SourcesProperty)
+ ADD_TEST_MACRO(SourceFileProperty SourceFileProperty)
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
set(runCxxDialectTest 1)
diff --git a/Tests/SourceFileProperty/CMakeLists.txt
b/Tests/SourceFileProperty/CMakeLists.txt
new file mode 100644
index 000..6a9b744
--- /dev/null
+++ b/Tests/SourceFileProperty/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+cmake_minimum_required(VERSION 3.0)
+
+project(SourceFileProperty)
+
+set(sources)
+
+if (EXISTS icasetest.c)
+ # If a file exists by this name, use it.
+ set_source_files_properties(icasetest.c
+PROPERTIES
+ COMPILE_FLAGS -DNEEDED_TO_WORK)
+else ()
+ # Work on case-sensitive file systems as well.
+ set_source_files_properties(main.c
+PROPERTIES
+ COMPILE_FLAGS -DNO_NEED_TO_CALL)
+endif ()
+list(APPEND sources ICaseTest.c)
+
+add_executable(SourceFileProperty main.c ${sources})
diff --git a/Tests/SourceFileProperty/ICaseTest.c
b/Tests/SourceFileProperty/ICaseTest.c
new file mode 100644
index 000..454c721
--- /dev/null
+++ b/Tests/SourceFileProperty/ICaseTest.c
@@ -0,0 +1,7 @@
+
+#ifdef NEEDED_TO_WORK
+int icasetest()
+{
+ return 0;
+}
+#endif
diff --git a/Tests/SourceFileProperty/main.c b/Tests/SourceFileProperty/main.c
new file mode 100644
index 000..b853408
--- /dev/null
+++ b/Tests/SourceFileProperty/main.c
@@ -0,0 +1,13 @@
+
+#ifndef NO_NEED_TO_CALL
+extern int icasetest();
+#endif
+
+int main(int argc, char** argv)
+{
+#ifdef NO_NEED_TO_CALL
+ return 0;
+#else
+ return icasetest();
+#endif
+}
---
Summary of changes:
Tests/CMakeLists.txt|1 +
Tests/SourceFileProperty/CMakeLists.txt | 21 +
Tests/SourceFileProperty/ICaseTest.c|7 +++
Tests/SourceFileProperty/main.c | 13 +
4 files changed, 42 insertions(+)
create mode 100644 Tests/SourceFileProperty/CMakeLists.txt
create mode 100644 Tests/SourceFileProperty/ICaseTest.c
create mode 100644 Tests/SourceFileProperty/main.c
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.1.0-rc2-585-g4dac995
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 4dac9953188a771eae2f23c0bda041cf1e1ab439 (commit)
via b138be07b4b2258a3c64245cdf13a4d7cc05b977 (commit)
via 8d379cd7ac25481ef3b43da12aade24b1e47ccdf (commit)
from 0639b23221a02676e1162f74da0ca7b346b14904 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dac9953188a771eae2f23c0bda041cf1e1ab439
commit 4dac9953188a771eae2f23c0bda041cf1e1ab439
Merge: 0639b23 b138be0
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Nov 13 13:33:07 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Nov 13 13:33:07 2014 -0500
Merge topic 'fix-vs2015-warnings' into next
b138be07 cmVisualStudio10TargetGenerator: fix a narrowing warning
8d379cd7 cmCallVisualStudioMacro: fix a shadowing warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b138be07b4b2258a3c64245cdf13a4d7cc05b977
commit b138be07b4b2258a3c64245cdf13a4d7cc05b977
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Nov 13 13:28:08 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Nov 13 13:28:08 2014 -0500
cmVisualStudio10TargetGenerator: fix a narrowing warning
0xAA literals are integers which doesn't fit into a char array. C++11
says this is an error and VS2015 now warns about it.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 26fc317..17a36d4 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -307,7 +307,7 @@ void cmVisualStudio10TargetGenerator::Generate()
this-BuildFileStream-SetCopyIfDifferent(true);
// Write the encoding header into the file
- char magic[] = {0xEF,0xBB, 0xBF};
+ char magic[] = {char(0xEF), char(0xBB), char(0xBF)};
this-BuildFileStream-write(magic, 3);
//get the tools version to use
@@ -937,7 +937,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
path += .vcxproj.filters;
cmGeneratedFileStream fout(path.c_str());
fout.SetCopyIfDifferent(true);
- char magic[] = {0xEF,0xBB, 0xBF};
+ char magic[] = {char(0xEF), char(0xBB), char(0xBF)};
fout.write(magic, 3);
cmGeneratedFileStream* save = this-BuildFileStream;
this-BuildFileStream = fout;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d379cd7ac25481ef3b43da12aade24b1e47ccdf
commit 8d379cd7ac25481ef3b43da12aade24b1e47ccdf
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Nov 13 13:27:56 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Nov 13 13:27:56 2014 -0500
cmCallVisualStudioMacro: fix a shadowing warning
diff --git a/Source/cmCallVisualStudioMacro.cxx
b/Source/cmCallVisualStudioMacro.cxx
index 0c15477..8f22f80 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -63,12 +63,13 @@ static bool LogErrorsAsMessages;
{ \
if (LogErrorsAsMessages) \
{ \
- std::ostringstream oss; \
- oss.flags(std::ios::hex); \
- oss context failed HRESULT, hr = 0x hr std::endl; \
- oss.flags(std::ios::dec); \
- oss __FILE__ ( __LINE__ ); \
- cmSystemTools::Message(oss.str().c_str()); \
+ std::ostringstream _hresult_oss; \
+ _hresult_oss.flags(std::ios::hex); \
+ _hresult_oss context failed HRESULT, hr = 0x \
+hr std::endl; \
+ _hresult_oss.flags(std::ios::dec); \
+ _hresult_oss __FILE__ ( __LINE__ ); \
+ cmSystemTools::Message(_hresult_oss.str().c_str()); \
} \
}
---
Summary of changes:
Source/cmCallVisualStudioMacro.cxx | 13 +++--
Source/cmVisualStudio10TargetGenerator.cxx |4 ++--
2 files changed, 9 insertions(+), 8 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.1.0-rc1-201-gf2efb33
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 f2efb33191d8ff719ae004698c6b6acf2cc0492b (commit)
via fb13502fca5a344dd35be6fc919ae7e89ce9c6ea (commit)
via fcb4541a05ea068715c8815c0294d2638721b071 (commit)
from 5fb80a3cb5df6350fe59608aa25c6e983e57123e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2efb33191d8ff719ae004698c6b6acf2cc0492b
commit f2efb33191d8ff719ae004698c6b6acf2cc0492b
Merge: 5fb80a3 fb13502
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Oct 29 11:48:23 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 29 11:48:23 2014 -0400
Merge topic 'unix-icon-install' into next
fb13502f QtDialog: install the 128x128 icon
fcb4541a QtDialog: don't install desktop file bits on Apple
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb13502fca5a344dd35be6fc919ae7e89ce9c6ea
commit fb13502fca5a344dd35be6fc919ae7e89ce9c6ea
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Oct 29 11:39:27 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Oct 29 11:47:29 2014 -0400
QtDialog: install the 128x128 icon
Also only install the icons to the icons directory.
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
index 7be495f..842091f 100644
--- a/Source/QtDialog/CMake.desktop
+++ b/Source/QtDialog/CMake.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=CMake
Comment=Cross-platform buildsystem
Exec=cmake-gui %f
-Icon=CMakeSetup32
+Icon=CMakeSetup
Terminal=false
X-MultipleArgs=false
Type=Application
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index feedcc9..b59af94 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -172,10 +172,16 @@ set(CMAKE_INSTALL_DESTINATION_ARGS
install(TARGETS cmake-gui RUNTIME DESTINATION bin
${CMAKE_INSTALL_DESTINATION_ARGS})
if(UNIX AND NOT APPLE)
+ foreach (size IN ITEMS 32 128)
+install(
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png
+ DESTINATION share/icons/hicolor/${size}x${size}/apps
+ RENAME CMakeSetup.png)
+ endforeach ()
+
# install a desktop file so CMake appears in the application start menu
# with an icon
install(FILES CMake.desktop DESTINATION share/applications )
- install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
install(FILES cmakecache.xml DESTINATION share/mime/packages )
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb4541a05ea068715c8815c0294d2638721b071
commit fcb4541a05ea068715c8815c0294d2638721b071
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Oct 29 11:38:48 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Oct 29 11:38:48 2014 -0400
QtDialog: don't install desktop file bits on Apple
Apple uses the dmg file which doesn't have .desktop support.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 03c2fb4..feedcc9 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -171,7 +171,7 @@ set(CMAKE_INSTALL_DESTINATION_ARGS
install(TARGETS cmake-gui RUNTIME DESTINATION bin
${CMAKE_INSTALL_DESTINATION_ARGS})
-if(UNIX)
+if(UNIX AND NOT APPLE)
# install a desktop file so CMake appears in the application start menu
# with an icon
install(FILES CMake.desktop DESTINATION share/applications )
---
Summary of changes:
Source/QtDialog/CMake.desktop |2 +-
Source/QtDialog/CMakeLists.txt | 10 --
2 files changed, 9 insertions(+), 3 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.1.0-rc1-203-g10387bf
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 10387bf9de790b468b93c822d0b6c24a53ac892d (commit) via f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 (commit) from f2efb33191d8ff719ae004698c6b6acf2cc0492b (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10387bf9de790b468b93c822d0b6c24a53ac892d commit 10387bf9de790b468b93c822d0b6c24a53ac892d Merge: f2efb33 f04e0a2 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Wed Oct 29 13:04:08 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 29 13:04:08 2014 -0400 Merge topic 'dev/alternate-generator-binaries' into next f04e0a2b ninja: Find alternate Ninja-compatible binaries http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 commit f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Mon Mar 10 19:54:06 2014 -0400 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Wed Oct 29 13:03:43 2014 -0400 ninja: Find alternate Ninja-compatible binaries On Red Hat distros, Ninja is /usr/bin/ninja-build because /usr/bin/ninja is an IRC bot. diff --git a/Modules/CMakeNinjaFindMake.cmake b/Modules/CMakeNinjaFindMake.cmake index c3ca767..2f35cf4 100644 --- a/Modules/CMakeNinjaFindMake.cmake +++ b/Modules/CMakeNinjaFindMake.cmake @@ -12,6 +12,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -find_program(CMAKE_MAKE_PROGRAM ninja +find_program(CMAKE_MAKE_PROGRAM + NAMES ninja-build ninja DOC Program used to build from build.ninja files.) mark_as_advanced(CMAKE_MAKE_PROGRAM) --- Summary of changes: Modules/CMakeNinjaFindMake.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.1.0-rc1-208-g9bbd621
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 9bbd6210e900046e2dd8f80b6380afa2bca25cd8 (commit)
via aee7e4a03b8b410212e2eae23d1ecc182c8da817 (commit)
via 368e8de4cd5a5d97c9b5e81489bf014579211bda (commit)
from 3e00a76c4ee11f3721d602e1bbcd2d4363c03cf6 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bbd6210e900046e2dd8f80b6380afa2bca25cd8
commit 9bbd6210e900046e2dd8f80b6380afa2bca25cd8
Merge: 3e00a76 aee7e4a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Oct 29 16:47:46 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 29 16:47:46 2014 -0400
Merge topic 'fix--D-command-line-parsing' into next
aee7e4a0 cmCacheManager: parse -D flags more strictly
368e8de4 Tests: test -D parsing on the command line
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aee7e4a03b8b410212e2eae23d1ecc182c8da817
commit aee7e4a03b8b410212e2eae23d1ecc182c8da817
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 20 12:17:19 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Oct 20 12:17:19 2014 -0400
cmCacheManager: parse -D flags more strictly
In the case of:
-DCACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG:BOOL=TRUE
the variable is parsed out as:
CACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG
because the parser allows '=' in the variable name. Disallow such a name
on the command line.
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index d6b84a0..17bfe4b 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -139,7 +139,7 @@ bool cmCacheManager::ParseEntry(const std::string entry,
{
// input line is: key:type=value
static cmsys::RegularExpression reg(
-^([^:]*):([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$);
+^([^=:]*):([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$);
// input line is: key:type=value
static cmsys::RegularExpression regQuoted(
^\([^\]*)\:([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$);
diff --git a/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
b/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
index a1cc8d3..bba64bc 100644
--- a/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
+++ b/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
@@ -1 +1 @@
-^$
+^---DBAR:BOOL=BAZ--$
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=368e8de4cd5a5d97c9b5e81489bf014579211bda
commit 368e8de4cd5a5d97c9b5e81489bf014579211bda
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 20 12:17:03 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Oct 20 12:17:03 2014 -0400
Tests: test -D parsing on the command line
diff --git a/Tests/RunCMake/CommandLine/CMakeLists.txt
b/Tests/RunCMake/CommandLine/CMakeLists.txt
new file mode 100644
index 000..2897109
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.0)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
b/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
new file mode 100644
index 000..a1cc8d3
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CommandLine/D_nested_cache.cmake
b/Tests/RunCMake/CommandLine/D_nested_cache.cmake
new file mode 100644
index 000..9b57284
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/D_nested_cache.cmake
@@ -0,0 +1 @@
+message(--${FOO}--)
diff --git a/Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt
b/Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt
new file mode 100644
index 000..bba64bc
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt
@@ -0,0 +1 @@
+^---DBAR:BOOL=BAZ--$
diff --git a/Tests/RunCMake/CommandLine/D_typed_nested_cache.cmake
b/Tests/RunCMake/CommandLine/D_typed_nested_cache.cmake
new file mode 100644
index 000..9b57284
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/D_typed_nested_cache.cmake
@@ -0,0 +1 @@
+message(--${FOO}--)
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 5622a5b..84e3614 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -43,3 +43,11 @@ run_cmake_command(E_sleep-bad-arg2 ${CMAKE_COMMAND} -E sleep
1 -1)
run_cmake_command(E_sleep-one-tenth ${CMAKE_COMMAND} -E sleep 0.1)
run_cmake_command(P_directory ${CMAKE_COMMAND} -P
[Cmake-commits] CMake branch, next, updated. v3.0.2-2183-ge5cde94
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 e5cde94df65918cf4d51ef7b8747732a02a3bdaf (commit)
via 911120284f9d3bd8e9d98e20e5bd0f292a2c958a (commit)
via d770c2f5291fc87c155628e349c39cf2bbee5d00 (commit)
from bf034eac301d0242c5fe673bb062bbea95ac73f5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5cde94df65918cf4d51ef7b8747732a02a3bdaf
commit e5cde94df65918cf4d51ef7b8747732a02a3bdaf
Merge: bf034ea 9111202
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 10:52:54 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Oct 24 10:52:54 2014 -0400
Merge topic 'variable-pull-failure' into next
91112028 cmDefinitions: only pull variables if they aren't local
d770c2f5 test: add test for PARENT_SCOPE behavior
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=911120284f9d3bd8e9d98e20e5bd0f292a2c958a
commit 911120284f9d3bd8e9d98e20e5bd0f292a2c958a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 10:48:21 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Oct 24 10:51:59 2014 -0400
cmDefinitions: only pull variables if they aren't local
Prior to the commit which changed behavior here, PARENT_SCOPE triggered
a -GetInternal() call which would internally pull down the parent's
value into the local scope. When converted over to an explicit -Pull()
call, the logic in -GetInternal() which ignored the parent if it is
already in scope was missed and instead unconditionally pulled down.
Reported-By: Ben Cooksley bcooks...@kde.org
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 5515f35..8a0e95e 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -71,7 +71,7 @@ const char* cmDefinitions::Get(const std::string key) const
//
void cmDefinitions::Pull(const std::string key)
{
- if (this-Up)
+ if (this-Up this-Map.find(key) == this-Map.end())
{
Def const def = this-Up-GetInternal(key);
if (def.Exists)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d770c2f5291fc87c155628e349c39cf2bbee5d00
commit d770c2f5291fc87c155628e349c39cf2bbee5d00
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 10:47:36 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Oct 24 10:51:08 2014 -0400
test: add test for PARENT_SCOPE behavior
Test code courtesy of Alex Merry alex.me...@kde.org.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index fd3bb03..6e35327 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -118,6 +118,7 @@ add_RunCMake_test(alias_targets)
add_RunCMake_test(interface_library)
add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
+add_RunCMake_test(ParentScope)
find_package(Qt4 QUIET)
find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/ParentScope/CMakeLists.txt
b/Tests/RunCMake/ParentScope/CMakeLists.txt
new file mode 100644
index 000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/ParentScope/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
b/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
new file mode 100644
index 000..768549b
--- /dev/null
+++ b/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
@@ -0,0 +1,3 @@
+^before PARENT_SCOPE blah=value2
+after PARENT_SCOPE blah=value2
+in parent scope, blah=value2$
diff --git a/Tests/RunCMake/ParentScope/ParentPulling.cmake
b/Tests/RunCMake/ParentScope/ParentPulling.cmake
new file mode 100644
index 000..2614533
--- /dev/null
+++ b/Tests/RunCMake/ParentScope/ParentPulling.cmake
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.0)
+project(Minimal NONE)
+
+function(test_set)
+set(blah value2)
+message(before PARENT_SCOPE blah=${blah})
+set(blah ${blah} PARENT_SCOPE)
+message(after PARENT_SCOPE blah=${blah})
+endfunction()
+
+set(blah value1)
+test_set()
+message(in parent scope, blah=${blah})
diff --git a/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
b/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
new file mode 100644
index 000..ca517b2
--- /dev/null
+++ b/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(ParentPulling)
---
Summary of changes
[Cmake-commits] CMake branch, next, updated. v3.0.2-2185-gab5e5a6
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 ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1 (commit)
via d7f72d1f7a85a5622ef081877ec8dd7d1d70258e (commit)
from e5cde94df65918cf4d51ef7b8747732a02a3bdaf (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1
commit ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1
Merge: e5cde94 d7f72d1
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 13:02:31 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Oct 24 13:02:31 2014 -0400
Merge topic 'variable-pull-failure' into next
d7f72d1f revert branch
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7f72d1f7a85a5622ef081877ec8dd7d1d70258e
commit d7f72d1f7a85a5622ef081877ec8dd7d1d70258e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 13:01:41 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Oct 24 13:01:41 2014 -0400
revert branch
This branch is being remade in two parts: the tests and the revert to
better facilitate testing and verification.
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 8a0e95e..5515f35 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -71,7 +71,7 @@ const char* cmDefinitions::Get(const std::string key) const
//
void cmDefinitions::Pull(const std::string key)
{
- if (this-Up this-Map.find(key) == this-Map.end())
+ if (this-Up)
{
Def const def = this-Up-GetInternal(key);
if (def.Exists)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 6e35327..fd3bb03 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -118,7 +118,6 @@ add_RunCMake_test(alias_targets)
add_RunCMake_test(interface_library)
add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
-add_RunCMake_test(ParentScope)
find_package(Qt4 QUIET)
find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/ParentScope/CMakeLists.txt
b/Tests/RunCMake/ParentScope/CMakeLists.txt
deleted file mode 100644
index 12cd3c7..000
--- a/Tests/RunCMake/ParentScope/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.4)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
b/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
deleted file mode 100644
index 768549b..000
--- a/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^before PARENT_SCOPE blah=value2
-after PARENT_SCOPE blah=value2
-in parent scope, blah=value2$
diff --git a/Tests/RunCMake/ParentScope/ParentPulling.cmake
b/Tests/RunCMake/ParentScope/ParentPulling.cmake
deleted file mode 100644
index 2614533..000
--- a/Tests/RunCMake/ParentScope/ParentPulling.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(Minimal NONE)
-
-function(test_set)
-set(blah value2)
-message(before PARENT_SCOPE blah=${blah})
-set(blah ${blah} PARENT_SCOPE)
-message(after PARENT_SCOPE blah=${blah})
-endfunction()
-
-set(blah value1)
-test_set()
-message(in parent scope, blah=${blah})
diff --git a/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
b/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
deleted file mode 100644
index ca517b2..000
--- a/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include(RunCMake)
-
-run_cmake(ParentPulling)
---
Summary of changes:
Source/cmDefinitions.cxx|2 +-
Tests/RunCMake/CMakeLists.txt |1 -
Tests/RunCMake/ParentScope/CMakeLists.txt |3 ---
Tests/RunCMake/ParentScope/ParentPulling-stderr.txt |3 ---
Tests/RunCMake/ParentScope/ParentPulling.cmake | 13 -
Tests/RunCMake/ParentScope/RunCMakeTest.cmake |3 ---
6 files changed, 1 insertion(+), 24 deletions(-)
delete mode 100644 Tests/RunCMake/ParentScope/CMakeLists.txt
delete mode 100644 Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
delete mode 100644 Tests/RunCMake/ParentScope/ParentPulling.cmake
delete mode 100644 Tests/RunCMake/ParentScope/RunCMakeTest.cmake
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.0.2-2191-ge3db575
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 e3db575e2e29789127fa40b2a7690aabd873a0b4 (commit)
via 4d6715e4ed2993b6e9b1753683662e4f3d8907e8 (commit)
via e0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96 (commit)
via 064c415d275433c332b7a38eb99df5d46aaa9f9e (commit)
via 679cb9863aeebbc1072c24704348648c6e2a2710 (commit)
via 61032bea1bcf23516fab87221890965263b3b317 (commit)
from ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3db575e2e29789127fa40b2a7690aabd873a0b4
commit e3db575e2e29789127fa40b2a7690aabd873a0b4
Merge: ab5e5a6 4d6715e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 13:08:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Oct 24 13:08:38 2014 -0400
Merge topic 'revert-definition-map-lookup' into next
4d6715e4 Merge branch 'parent-scope-tests' into variable-pull-failure
e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes
064c415d test: add test for PARENT_SCOPE behavior
679cb986 Revert cmDefinitions: Don't store parent lookups
61032bea cmDefinitions: only pull variables if they aren't local
diff --cc Source/cmDefinitions.cxx
index 5515f35,babf1c4..fe32dd5
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@@ -36,10 -35,11 +36,11 @@@ cmDefinitions::GetInternal(const std::s
{
return i-second;
}
- else if(cmDefinitions* up = this-Up)
+ if(cmDefinitions* up = this-Up)
{
- // Query the parent scope.
- return up-GetInternal(key);
+ // Query the parent scope and store the result locally.
+ Def def = up-GetInternal(key);
+ return this-Map.insert(MapType::value_type(key, def)).first-second;
}
return this-NoDef;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d6715e4ed2993b6e9b1753683662e4f3d8907e8
commit 4d6715e4ed2993b6e9b1753683662e4f3d8907e8
Merge: 679cb98 e0c0b1a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 13:00:28 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Oct 24 13:00:28 2014 -0400
Merge branch 'parent-scope-tests' into variable-pull-failure
* parent-scope-tests:
test: add a test for PARENT_SCOPE with multiple scopes
test: add test for PARENT_SCOPE behavior
Conflicts:
Tests/RunCMake/set/RunCMakeTest.cmake
diff --cc Tests/RunCMake/set/RunCMakeTest.cmake
index 1b51ea2,0b96b28..b8e8cf1
--- a/Tests/RunCMake/set/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set/RunCMakeTest.cmake
@@@ -1,3 -1,5 +1,5 @@@
include(RunCMake)
-run_cmake(PARENT_SCOPE)
+run_cmake(ParentScope)
+ run_cmake(ParentPulling)
+ run_cmake(ParentPullingRecursive)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96
commit e0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 24 12:37:29 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri Oct 24 13:00:11 2014 -0400
test: add a test for PARENT_SCOPE with multiple scopes
See the comment in the test for what is being tested here.
diff --git a/Tests/RunCMake/set/ParentPullingRecursive-stderr.txt
b/Tests/RunCMake/set/ParentPullingRecursive-stderr.txt
new file mode 100644
index 000..f3260ae
--- /dev/null
+++ b/Tests/RunCMake/set/ParentPullingRecursive-stderr.txt
@@ -0,0 +1,144 @@
+--
+variable values at top before calls:
+top_implicit_inner_set: --top--
+top_implicit_inner_unset: undefined
+top_explicit_inner_set: --top--
+top_explicit_inner_unset: undefined
+top_explicit_inner_tounset: --top--
+top_implicit_outer_set: --top--
+top_explicit_outer_unset: undefined
+top_explicit_outer_set: --top--
+top_explicit_outer_unset: undefined
+top_explicit_outer_tounset: --top--
+outer_implicit_inner_set: undefined
+outer_implicit_inner_unset: undefined
+outer_explicit_inner_set: undefined
+outer_explicit_inner_unset: undefined
+outer_explicit_inner_tounset: undefined
+--
+--
+variable values at outer start:
+top_implicit_inner_set: --top--
+top_implicit_inner_unset: undefined
+top_explicit_inner_set: --top--
+top_explicit_inner_unset: undefined
+top_explicit_inner_tounset: --top--
+top_implicit_outer_set: --top--
+top_explicit_outer_unset: undefined
+top_explicit_outer_set: --top--
+top_explicit_outer_unset: undefined
+top_explicit_outer_tounset: --top--
+outer_implicit_inner_set: undefined
+outer_implicit_inner_unset: undefined
+outer_explicit_inner_set: undefined
+outer_explicit_inner_unset
[Cmake-commits] CMake branch, next, updated. v3.0.2-2089-g6254fc8
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 6254fc83ee80504d2c058a2a70198b587e0c3d88 (commit)
via ed766d6ad2b3eeff6493d420297a3c35b07c71ef (commit)
from 01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6254fc83ee80504d2c058a2a70198b587e0c3d88
commit 6254fc83ee80504d2c058a2a70198b587e0c3d88
Merge: 01a4ca4 ed766d6
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 20 11:49:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 20 11:49:13 2014 -0400
Merge topic 'cmake-cmp0054-warnings' into next
ed766d6a fixup! Avoid if() quoted auto-dereference
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed766d6ad2b3eeff6493d420297a3c35b07c71ef
commit ed766d6ad2b3eeff6493d420297a3c35b07c71ef
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 20 11:49:06 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Oct 20 11:49:06 2014 -0400
fixup! Avoid if() quoted auto-dereference
diff --git a/Modules/CMakeDetermineCompilerABI.cmake
b/Modules/CMakeDetermineCompilerABI.cmake
index 3d5c113..4bc42dd 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,7 +28,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
set(CMAKE_FLAGS -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG})
endif()
-if(NOT CMAKE_${lang}_COMPILER_ID STREQUAL MSVC)
+if(NOT x${CMAKE_${lang}_COMPILER_ID} STREQUAL xMSVC)
# Avoid adding our own platform standard libraries for compilers
# from which we might detect implicit link libraries.
list(APPEND CMAKE_FLAGS -DCMAKE_${lang}_STANDARD_LIBRARIES=)
---
Summary of changes:
Modules/CMakeDetermineCompilerABI.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.0.2-2087-g01a4ca4
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 01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d (commit)
via 7ea1da1a2f2fe5fe9743190b4c7e2232dd5e81e5 (commit)
from a8e26f88de9cc5ca38b264a34ce498a1808d8c44 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d
commit 01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d
Merge: a8e26f8 7ea1da1
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 17 14:42:39 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Oct 17 14:42:39 2014 -0400
Merge topic 'cmake-cmp0054-warnings' into next
7ea1da1a Avoid if() quoted auto-dereference
diff --cc Utilities/cmlibarchive/CMakeLists.txt
index 220a4c6,3f41dd1..b150408
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@@ -56,11 -56,13 +56,11 @@@ SET(CMAKE_REQUIRED_LIBRARIES
SET(CMAKE_REQUIRED_FLAGS)
# Disable warnings to avoid changing 3rd party code.
- IF(${CMAKE_C_COMPILER_ID} MATCHES
+ IF(CMAKE_C_COMPILER_ID MATCHES
^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w)
- ELSEIF(${CMAKE_C_COMPILER_ID} MATCHES ^(PathScale)$)
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL PathScale)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -woffall)
-ELSEIF(BORLAND)
- SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w-)
ENDIF()
# Enable CTest/CDash support
diff --cc Utilities/cmliblzma/CMakeLists.txt
index 27ec2d0,4f2b9ba..c03147f
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@@ -201,11 -201,13 +201,11 @@@ INCLUDE_DIRECTORIES
)
# Disable warnings to avoid changing 3rd party code.
- IF(${CMAKE_C_COMPILER_ID} MATCHES
+ IF(CMAKE_C_COMPILER_ID MATCHES
^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w)
- ELSEIF(${CMAKE_C_COMPILER_ID} MATCHES ^(PathScale)$)
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL PathScale)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -woffall)
-ELSEIF(BORLAND)
- SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w-)
ENDIF()
ADD_LIBRARY(cmliblzma ${LZMA_SRCS})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ea1da1a2f2fe5fe9743190b4c7e2232dd5e81e5
commit 7ea1da1a2f2fe5fe9743190b4c7e2232dd5e81e5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Oct 14 10:25:32 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Oct 14 13:39:08 2014 -0400
Avoid if() quoted auto-dereference
When testing CMAKE_LANG_COMPILER_ID values, do not explicitly
dereference or quote the variable. We want if() to auto-dereference the
variable and not its value. Also replace MATCHES with STREQUAL where
equivalent.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71850de..f101624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -555,7 +555,7 @@ CMAKE_SETUP_TESTING()
if(NOT CMake_TEST_EXTERNAL_CMAKE)
if(NOT CMake_VERSION_IS_RELEASE)
-if(${CMAKE_C_COMPILER_ID} STREQUAL GNU AND
+if(CMAKE_C_COMPILER_ID STREQUAL GNU AND
NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS 4.2)
set(C_FLAGS_LIST -Wcast-align -Werror-implicit-function-declaration
-Wchar-subscripts
-Wall -W -Wpointer-arith -Wwrite-strings
-Wformat-security
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index a4a4a78..5d86876 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -20,7 +20,7 @@ if(CMAKE_GENERATOR MATCHES Visual Studio 6)
set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
endif()
-if(WIN32 AND ${CMAKE_C_COMPILER_ID} MATCHES ^(Intel)$)
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL Intel)
set(_INTEL_WINDOWS 1)
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 6b425c6..937aa8c 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -108,7 +108,7 @@ if(NOT CMAKE_C_COMPILER_ID_RUN)
CMAKE_DETERMINE_COMPILER_ID(C CFLAGS CMakeCCompilerId.c)
# Set old compiler and platform id variables.
- if(${CMAKE_C_COMPILER_ID} MATCHES GNU)
+ if(CMAKE_C_COMPILER_ID MATCHES GNU)
set(CMAKE_COMPILER_IS_GNUCC 1)
endif()
if(${CMAKE_C_PLATFORM_ID} MATCHES MinGW)
@@ -131,11 +131,11 @@ endif ()
# arm-unknown-nto-qnx6 instead of the correct arm-unknown-nto-qnx6.3.0-
if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
- if(${CMAKE_C_COMPILER_ID} MATCHES GNU OR ${CMAKE_C_COMPILER_ID}
MATCHES Clang)
+ if(CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
get_filename_component
[Cmake-commits] CMake branch, next, updated. v3.0.2-2061-g1e55cff
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 1e55cff13198c644f6a3c3e31b0552050dd8fb4a (commit)
via 0ad175bca3aadbfa7cadd0a09ff839b01f9d681c (commit)
from 08a3581f34c1d83ae8aa3f7a73580477c3dfc6c1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e55cff13198c644f6a3c3e31b0552050dd8fb4a
commit 1e55cff13198c644f6a3c3e31b0552050dd8fb4a
Merge: 08a3581 0ad175b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Oct 14 10:31:58 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 14 10:31:58 2014 -0400
Merge topic 'cmake-cmp0054-warnings' into next
0ad175bc KWIML: fix CMP0054 warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ad175bca3aadbfa7cadd0a09ff839b01f9d681c
commit 0ad175bca3aadbfa7cadd0a09ff839b01f9d681c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Oct 14 10:25:32 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Oct 14 10:25:32 2014 -0400
KWIML: fix CMP0054 warning
diff --git a/Utilities/KWIML/test/CMakeLists.txt
b/Utilities/KWIML/test/CMakeLists.txt
index a2359cc..a16b5cd 100644
--- a/Utilities/KWIML/test/CMakeLists.txt
+++ b/Utilities/KWIML/test/CMakeLists.txt
@@ -20,7 +20,7 @@ set_property(DIRECTORY
# Suppress printf/scanf format warnings; we test if the sizes match.
foreach(lang C CXX)
- if(KWIML_LANGUAGE_${lang} AND ${CMAKE_${lang}_COMPILER_ID} STREQUAL GNU)
+ if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL GNU)
set(CMAKE_${lang}_FLAGS ${CMAKE_${lang}_FLAGS} -Wno-format)
endif()
endforeach()
---
Summary of changes:
Utilities/KWIML/test/CMakeLists.txt |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.0.2-5620-gd33aceb
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 d33aceb1e1351f51f793376b0bb4be13b23cce2e (commit)
via 51ec99a8af927eb70a3c7f1447d8ffc1cd316a25 (commit)
via da98d8cbc23da6bb137298947e1676bda66833f5 (commit)
via 6f1f0af9c61457bb547946c9384080ad8fb611e8 (commit)
via f25e431d6efc2f03b49e15c831df9ee17594eea2 (commit)
via f0661bf318b75ebb191a4e0ba07e4e15d260710d (commit)
via ca9cc25ce8c6f74998fd9f30d36449814c170ea5 (commit)
via 0b9cd437c3538ff5aa1858d743a289b06129 (commit)
from a1859811ec00a1b0c3755c023e32cce83c0ffe0d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d33aceb1e1351f51f793376b0bb4be13b23cce2e
commit d33aceb1e1351f51f793376b0bb4be13b23cce2e
Merge: a185981 51ec99a
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 6 15:29:43 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 6 15:29:43 2014 -0400
Merge topic 'ubsan-support' into next
51ec99a8 tests: add a test for ubsan
da98d8cb dev: add release notes for UBSan support
6f1f0af9 ctest: add a UBSan memorycheck type
f25e431d tests: set sanitizer options properly
f0661bf3 tests: fix copy/paste from tsan - asan comments
ca9cc25c ctest: add support for additional sanitizer options
0b9c ctest: update documentation for CTEST_MEMORYCHECK_TYPE
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51ec99a8af927eb70a3c7f1447d8ffc1cd316a25
commit 51ec99a8af927eb70a3c7f1447d8ffc1cd316a25
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Oct 6 14:13:37 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Oct 6 15:28:45 2014 -0400
tests: add a test for ubsan
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index 7422eb5..b564892 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -150,6 +150,21 @@
set_tests_properties(CTestTestMemcheckDummyAddressSanitizer PROPERTIES
PASS_REGULAR_EXPRESSION
.*Memory checking results:.*heap-buffer-overflow - 1.*)
+# add UndefinedBehaviorSanitizer test
+set(CTEST_EXTRA_CODE
+set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \simulate_sanitizer=1\)
+)
+
+set(CMAKELISTS_EXTRA_CODE
+add_test(NAME TestSan COMMAND \${CMAKE_COMMAND}\
+-P \${CMAKE_CURRENT_SOURCE_DIR}/testUndefinedBehaviorSanitizer.cmake\)
+)
+gen_mc_test_internal(DummyUndefinedBehaviorSanitizer
-DMEMCHECK_TYPE=UndefinedBehaviorSanitizer)
+set(CMAKELISTS_EXTRA_CODE )
+set(CTEST_EXTRA_CODE)
+set_tests_properties(CTestTestMemcheckDummyUndefinedBehaviorSanitizer
PROPERTIES
+PASS_REGULAR_EXPRESSION
+.*Memory checking results:.*left shift of negative value -256 - 1.*)
gen_mc_test(DummyPurify \${PSEUDO_PURIFY})
gen_mc_test(DummyValgrind \${PSEUDO_VALGRIND})
diff --git a/Tests/CTestTestMemcheck/testUndefinedBehaviorSanitizer.cmake
b/Tests/CTestTestMemcheck/testUndefinedBehaviorSanitizer.cmake
new file mode 100644
index 000..8ef3c0a
--- /dev/null
+++ b/Tests/CTestTestMemcheck/testUndefinedBehaviorSanitizer.cmake
@@ -0,0 +1,21 @@
+# this file simulates a program that has been built with undefined behavior
+# sanitizer options
+
+message(UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}])
+string(REGEX REPLACE .*log_path=\([^\]*)\.* \\1 LOG_FILE
$ENV{UBSAN_OPTIONS})
+message(LOG_FILE=[${LOG_FILE}])
+
+# if we are not asked to simulate address sanitizer don't do it
+if(NOT $ENV{UBSAN_OPTIONS}] MATCHES simulate_sanitizer.1)
+ return()
+endif()
+# clear the log file
+file(REMOVE ${LOG_FILE}.2343)
+
+# create an error like undefined behavior santizer creates;
+# these names come from ubsan_diag.cc and ubsan_handlers.cc
+# in llvm
+
+file(APPEND ${LOG_FILE}.2343
+unknown: runtime error: left shift of negative value -256
+)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da98d8cbc23da6bb137298947e1676bda66833f5
commit da98d8cbc23da6bb137298947e1676bda66833f5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Oct 3 13:48:41 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Oct 6 15:28:45 2014 -0400
dev: add release notes for UBSan support
diff --git a/Help/release/dev/ubsan-support.rst
b/Help/release/dev/ubsan-support.rst
new file mode 100644
index 000..7bd6133
--- /dev/null
+++ b/Help/release/dev/ubsan-support.rst
@@ -0,0 +1,6 @@
+ubsan-support
+-
+
+* Add a ``UndefinedBehaviorSanitizer`` memcheck tooling type.
+* Add support for sanitizer options through
+ :variable:`CTEST_MEMORYCHECK_SANITIZER_OPTIONS`.
http://cmake.org/gitweb?p
[Cmake-commits] CMake branch, next, updated. v3.0.0-4327-g90d9a5d
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 90d9a5d367cf433b8431aedbe08604284efb9a9a (commit)
via 511213e24af5a639920dc94fd7df1f3d24176a88 (commit)
via fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397 (commit)
from d913fb3da353c0e9b2424a1bd358b9f8b2082315 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90d9a5d367cf433b8431aedbe08604284efb9a9a
commit 90d9a5d367cf433b8431aedbe08604284efb9a9a
Merge: d913fb3 511213e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:27:40 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 17 09:27:40 2014 -0400
Merge topic 'dev/target-fastpaths' into next
511213e2 fixup! cmTarget: Use static strings for special property names
fe0c2948 fixup! cmTarget: Fast path for regular properties
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=511213e24af5a639920dc94fd7df1f3d24176a88
commit 511213e24af5a639920dc94fd7df1f3d24176a88
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:25:49 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 17 09:25:49 2014 -0400
fixup! cmTarget: Use static strings for special property names
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7479133..843761f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5076,7 +5076,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget
const* tgt,
CompatibleType t,
PropertyType *)
{
- PropertyType propContent = getTypedPropertyPropertyType(tgt, p.c_str(),
+ PropertyType propContent = getTypedPropertyPropertyType(tgt, p,
0);
const bool explicitlySet = tgt-GetProperties()
.find(p)
@@ -5130,7 +5130,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget
const* tgt,
!= theTarget-GetProperties().end();
PropertyType ifacePropContent =
getTypedPropertyPropertyType(theTarget,
- interfaceProperty.c_str(), 0);
+ interfaceProperty, 0);
std::string reportEntry;
if (ifaceIsSet)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
commit fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 17 09:21:19 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 17 09:21:19 2014 -0400
fixup! cmTarget: Fast path for regular properties
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a203a7f..7479133 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3260,12 +3260,12 @@ const char *cmTarget::GetProperty(const std::string
prop,
}
if (!noMessage)
{
- e Target \ this-Name \ contains $TARGET_OBJECTS
- generator expression in its sources list. This content was not
- previously part of the SOURCES property when that property was
- read at configure time. Code reading that property needs to be
- adapted to ignore the generator expression using the
- string(GENEX_STRIP) command.;
+ e Target \ this-Name \ contains
+ $TARGET_OBJECTS generator expression in its sources list.
+ This content was not previously part of the SOURCES property
+ when that property was read at configure time. Code reading
+ that property needs to be adapted to ignore the generator
+ expression using the string(GENEX_STRIP) command.;
context-IssueMessage(messageType, e.str());
}
if (addContent)
---
Summary of changes:
Source/cmTarget.cxx | 16
1 file changed, 8 insertions(+), 8 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.0.0-4318-g77066b4
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 77066b46b623d4adca35cdbb196dcec4472c54ab (commit)
via dccda39c29010f18b4f4d6f1d1b49552073e767e (commit)
from c77871bb8b938d98420f4e7cd833cc38b58fd748 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77066b46b623d4adca35cdbb196dcec4472c54ab
commit 77066b46b623d4adca35cdbb196dcec4472c54ab
Merge: c77871b dccda39
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jul 16 17:32:55 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 16 17:32:55 2014 -0400
Merge topic 'dev/target-fastpaths' into next
dccda39c fixup! cmTarget: Use static strings for special property names
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dccda39c29010f18b4f4d6f1d1b49552073e767e
commit dccda39c29010f18b4f4d6f1d1b49552073e767e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jul 16 17:32:48 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jul 16 17:32:48 2014 -0400
fixup! cmTarget: Use static strings for special property names
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 47ca8dd..393c447 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6197,7 +6197,6 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
// Compare the link implementation fallback link interface to the
// preferred new link interface property and warn if different.
std::vectorcmLinkItem ifaceLibs;
- if(const char* newExplicitLibraries = this-GetProperty(newProp))
if(const char* newExplicitLibraries = thisTarget-GetProperty(newProp))
{
thisTarget-ExpandLinkItems(newProp, newExplicitLibraries, config,
---
Summary of changes:
Source/cmTarget.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.0.0-4320-gf1e74a6
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 f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d (commit)
via 086201fcca622e97d6925523671a99efadf4c885 (commit)
from 77066b46b623d4adca35cdbb196dcec4472c54ab (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d
commit f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d
Merge: 77066b4 086201f
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jul 16 17:35:24 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 16 17:35:24 2014 -0400
Merge topic 'dev/target-fastpaths' into next
086201fc fixup! cmTarget: Use static strings for special property names
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=086201fcca622e97d6925523671a99efadf4c885
commit 086201fcca622e97d6925523671a99efadf4c885
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Jul 16 17:35:17 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Jul 16 17:35:17 2014 -0400
fixup! cmTarget: Use static strings for special property names
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 393c447..a203a7f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6197,6 +6197,7 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
// Compare the link implementation fallback link interface to the
// preferred new link interface property and warn if different.
std::vectorcmLinkItem ifaceLibs;
+ static const std::string newProp = INTERFACE_LINK_LIBRARIES;
if(const char* newExplicitLibraries = thisTarget-GetProperty(newProp))
{
thisTarget-ExpandLinkItems(newProp, newExplicitLibraries, config,
---
Summary of changes:
Source/cmTarget.cxx |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.0.0-4229-g5872fac
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 5872fac134116adb2c3ffe0b493b46b157c9fac7 (commit)
via 4b139169702dec37039869cc4af064c18e6789b8 (commit)
from b16ffbd22ca372c99c1e538e0e0e0f9cbf6026ae (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5872fac134116adb2c3ffe0b493b46b157c9fac7
commit 5872fac134116adb2c3ffe0b493b46b157c9fac7
Merge: b16ffbd 4b13916
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jul 14 12:55:35 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 14 12:55:35 2014 -0400
Merge topic 'dev/fix-cmake-rule-property' into next
4b139169 cmMakefile: fix __CMAKE_RULE property setting
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b139169702dec37039869cc4af064c18e6789b8
commit 4b139169702dec37039869cc4af064c18e6789b8
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jul 14 12:55:04 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jul 14 12:55:04 2014 -0400
cmMakefile: fix __CMAKE_RULE property setting
It got put into the condition by mistake.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2218e2f..d3ca34a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1042,8 +1042,8 @@ cmMakefile::AddCustomCommandToOutput(const
std::vectorstd::string outputs,
if (!file)
{
file = this-CreateSource(outName, true);
- file-SetProperty(__CMAKE_RULE, 1);
}
+file-SetProperty(__CMAKE_RULE, 1);
}
// Always create the output sources and mark them generated.
---
Summary of changes:
Source/cmMakefile.cxx |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.0.0-4244-gddd524e
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 ddd524eeba6310b556339471a6830469843d836b (commit)
via 43a8c5526d12c1346793ced5a4be85b9e9a3d695 (commit)
via 9270aa9a2d1ea05e7bd63ef5214f4fbaafd14d2e (commit)
from 90ecd1721f2c2bcc7e2302c047e040a437c03aa5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddd524eeba6310b556339471a6830469843d836b
commit ddd524eeba6310b556339471a6830469843d836b
Merge: 90ecd17 43a8c55
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jul 14 15:19:47 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 14 15:19:47 2014 -0400
Merge topic 'dev/ison-isoff-performance' into next
43a8c552 SystemTools: Use a set in Is{On,Off}
9270aa9a IsOff: Use the length for the string construction
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43a8c5526d12c1346793ced5a4be85b9e9a3d695
commit 43a8c5526d12c1346793ced5a4be85b9e9a3d695
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Sat Feb 8 05:42:14 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jul 8 11:18:15 2014 -0400
SystemTools: Use a set in Is{On,Off}
Also check before calling toupper() umpteen million times.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index aa39c39..444e143 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -384,14 +384,28 @@ bool cmSystemTools::IsOn(const char* val)
{
return false;
}
- std::basic_stringchar v = val;
+ size_t len = strlen(val);
+ if (len 4)
+{
+return false;
+}
+ std::basic_stringchar v(val, len);
+ static std::setstd::string onValues;
+ if(onValues.empty())
+{
+onValues.insert(ON);
+onValues.insert(1);
+onValues.insert(YES);
+onValues.insert(TRUE);
+onValues.insert(Y);
+}
for(std::basic_stringchar::iterator c = v.begin();
c != v.end(); c++)
{
*c = static_castchar(toupper(*c));
}
- return (v == ON || v == 1 || v == YES || v == TRUE || v == Y);
+ return (onValues.count(v) 0);
}
bool cmSystemTools::IsNOTFOUND(const char* val)
@@ -410,16 +424,31 @@ bool cmSystemTools::IsOff(const char* val)
{
return true;
}
- size_t len = val ? strlen(val) : 0;
- std::basic_stringchar v(val, len);
+ size_t len = strlen(val);
+ // Try and avoid toupper() for large strings.
+ if (len 6)
+{
+return cmSystemTools::IsNOTFOUND(val);
+}
+ static std::setstd::string offValues;
+ if(offValues.empty())
+{
+offValues.insert(OFF);
+offValues.insert(0);
+offValues.insert(NO);
+offValues.insert(FALSE);
+offValues.insert(N);
+offValues.insert(IGNORE);
+}
+ // Try and avoid toupper().
+ std::basic_stringchar v(val, len);
for(std::basic_stringchar::iterator c = v.begin();
c != v.end(); c++)
{
*c = static_castchar(toupper(*c));
}
- return (v == OFF || v == 0 || v == NO || v == FALSE ||
- v == N || cmSystemTools::IsNOTFOUND(v.c_str()) || v == IGNORE);
+ return (offValues.count(v) 0);
}
//
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9270aa9a2d1ea05e7bd63ef5214f4fbaafd14d2e
commit 9270aa9a2d1ea05e7bd63ef5214f4fbaafd14d2e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Sep 2 16:28:21 2013 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jul 8 11:16:16 2014 -0400
IsOff: Use the length for the string construction
No need to waste the calculation and force the string to call strlen
again.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 12a63b0..aa39c39 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -406,11 +406,12 @@ bool cmSystemTools::IsNOTFOUND(const char* val)
bool cmSystemTools::IsOff(const char* val)
{
- if (!val || strlen(val) == 0)
+ if (!val || !*val)
{
return true;
}
- std::basic_stringchar v = val;
+ size_t len = val ? strlen(val) : 0;
+ std::basic_stringchar v(val, len);
for(std::basic_stringchar::iterator c = v.begin();
c != v.end(); c++)
---
Summary of changes:
Source/cmSystemTools.cxx | 42 --
1 file changed, 36 insertions(+), 6 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.0.0-4151-g3c6c197
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 3c6c1970758fbee09b4c72d85cb27097717a0c9c (commit)
via 6208c285c8ae43d566474f488a00967b74ee4389 (commit)
via dc2e26df01eb4230a69c43a05b867fce330f57a4 (commit)
via d2803fbac6ca20c998ff5364e79f0841eba6c579 (commit)
via 49c830d597bbd8322c7b41847eac3012064b0b7d (commit)
from 7a9c33d47919d0554e2bfb78442c3afc67b12bb1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c6c1970758fbee09b4c72d85cb27097717a0c9c
commit 3c6c1970758fbee09b4c72d85cb27097717a0c9c
Merge: 7a9c33d 6208c28
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jul 8 10:20:03 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 8 10:20:03 2014 -0400
Merge topic 'dev/custom-target-performance' into next
6208c285 cmMakefile: Defer dependency calculations
dc2e26df cmMakefile: Avoid excess source files
d2803fba cmMakefile: Add a CreateSource method
49c830d5 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6208c285c8ae43d566474f488a00967b74ee4389
commit 6208c285c8ae43d566474f488a00967b74ee4389
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Mar 21 22:27:59 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jul 8 10:13:51 2014 -0400
cmMakefile: Defer dependency calculations
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 452d3f6..2218e2f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1056,16 +1056,16 @@ cmMakefile::AddCustomCommandToOutput(const
std::vectorstd::string outputs,
}
}
- // Construct a complete list of dependencies.
- std::vectorstd::string depends2(depends);
- if(!main_dependency.empty())
-{
-depends2.push_back(main_dependency);
-}
-
// Attach the custom command to the file.
if(file)
{
+// Construct a complete list of dependencies.
+std::vectorstd::string depends2(depends);
+if(!main_dependency.empty())
+ {
+ depends2.push_back(main_dependency);
+ }
+
cmCustomCommand* cc =
new cmCustomCommand(this, outputs, depends2, commandLines,
comment, workingDir);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc2e26df01eb4230a69c43a05b867fce330f57a4
commit dc2e26df01eb4230a69c43a05b867fce330f57a4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Mar 12 17:29:04 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue Jul 8 10:13:51 2014 -0400
cmMakefile: Avoid excess source files
When there are no commands, a main_dependency is not required and when
there are also no dependencies, nothing is required.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c4543d7..452d3f6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -989,7 +989,7 @@ cmMakefile::AddCustomCommandToOutput(const
std::vectorstd::string outputs,
// Choose a source file on which to store the custom command.
cmSourceFile* file = 0;
- if(!main_dependency.empty())
+ if(!commandLines.empty() !main_dependency.empty())
{
// The main dependency was specified. Use it unless a different
// custom command already used it.
@@ -1257,28 +1257,31 @@ cmMakefile::AddUtilityCommand(const std::string
utilityName,
}
// Store the custom command in the target.
- std::string force = this-GetStartOutputDirectory();
- force += cmake::GetCMakeFilesDirectory();
- force += /;
- force += utilityName;
- std::string no_main_dependency = ;
- bool no_replace = false;
- this-AddCustomCommandToOutput(force, depends,
- no_main_dependency,
- commandLines, comment,
- workingDirectory, no_replace,
- escapeOldStyle);
- cmSourceFile* sf = target-AddSourceCMP0049(force);
-
- // The output is not actually created so mark it symbolic.
- if(sf)
-{
-sf-SetProperty(SYMBOLIC, 1);
-}
- else
-{
-cmSystemTools::Error(Could not get source file entry for ,
- force.c_str());
+ if (!commandLines.empty() || !depends.empty())
+{
+std::string force = this-GetStartOutputDirectory();
+force += cmake::GetCMakeFilesDirectory();
+force += /;
+force += utilityName;
+std::string no_main_dependency = ;
+bool no_replace = false;
+this-AddCustomCommandToOutput(force, depends,
+ no_main_dependency
[Cmake-commits] CMake branch, next, updated. v3.0.0-4095-g436841e
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 436841e506cc7590c7558dcd0d38acb1532aaac3 (commit)
via 5ca1d3d59c9a0c7df7db335fe225896480e4873f (commit)
via 6d1ad670771271bbdd7e3ff3bfa19474049cc139 (commit)
from 3ecd1347b54bbfa2745880de9631f86ae4b90305 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=436841e506cc7590c7558dcd0d38acb1532aaac3
commit 436841e506cc7590c7558dcd0d38acb1532aaac3
Merge: 3ecd134 5ca1d3d
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 3 10:24:19 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 3 10:24:19 2014 -0400
Merge topic 'dev/export-from-obj-libs' into next
5ca1d3d5 GenerateExportHeader: support exporting from OBJECT libraries
6d1ad670 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ca1d3d59c9a0c7df7db335fe225896480e4873f
commit 5ca1d3d59c9a0c7df7db335fe225896480e4873f
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jul 3 10:23:40 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jul 3 10:23:40 2014 -0400
GenerateExportHeader: support exporting from OBJECT libraries
diff --git a/Modules/GenerateExportHeader.cmake
b/Modules/GenerateExportHeader.cmake
index 66d300a..f00b577 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -363,6 +363,7 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
if(NOT ${type} STREQUAL STATIC_LIBRARY
AND NOT ${type} STREQUAL SHARED_LIBRARY
+ AND NOT ${type} STREQUAL OBJECT_LIBRARY
AND NOT ${type} STREQUAL MODULE_LIBRARY)
message(WARNING This macro can only be used with libraries)
return()
---
Summary of changes:
Modules/GenerateExportHeader.cmake |1 +
Source/CMakeVersion.cmake |2 +-
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.0.0-3685-g93f55d8
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 93f55d8f32898c524862cc398f518bbfa0954b0d (commit)
via e17a69bc744ce0ed36e41be36694ca0053330d78 (commit)
via 3b21705d534c16a6197f28db68ea81e2816bfec3 (commit)
via 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49 (commit)
from 8804320539e406a9ed2fdd5aa17bb152c8ff0eea (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f55d8f32898c524862cc398f518bbfa0954b0d
commit 93f55d8f32898c524862cc398f518bbfa0954b0d
Merge: 8804320 e17a69b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue Jun 10 15:12:36 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 10 15:12:36 2014 -0400
Merge topic 'dev/variable-lookup' into next
e17a69bc cmDefinitions: Use a hashmap for faster checks
3b21705d cmDefinitions: Avoid a find-then-insert when setting variables
5abfde6c cmDefinitions: Don't store parent lookups
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e17a69bc744ce0ed36e41be36694ca0053330d78
commit e17a69bc744ce0ed36e41be36694ca0053330d78
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Wed Mar 12 01:48:06 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jun 9 14:46:45 2014 -0400
cmDefinitions: Use a hashmap for faster checks
The hash map is much faster at checking that the map won't have what
we're looking for so that we can just go to the parent scope instead.
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 6502163..5515f35 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -15,7 +15,8 @@
cmDefinitions::Def cmDefinitions::NoDef;
//
-cmDefinitions::cmDefinitions(cmDefinitions* parent): Up(parent)
+cmDefinitions::cmDefinitions(cmDefinitions* parent)
+ : Up(parent)
{
}
@@ -35,7 +36,7 @@ cmDefinitions::GetInternal(const std::string key) const
{
return i-second;
}
- else if(cmDefinitions* up = this-Up)
+ if(cmDefinitions* up = this-Up)
{
// Query the parent scope.
return up-GetInternal(key);
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index ebe6fa5..5209a8b 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -13,6 +13,9 @@
#define cmDefinitions_h
#include cmStandardIncludes.h
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+#include cmsys/hash_map.hxx
+#endif
/** \class cmDefinitions
* \brief Store a scope of variable definitions for CMake language.
@@ -71,7 +74,11 @@ private:
cmDefinitions* Up;
// Local definitions, set or unset.
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ typedef cmsys::hash_mapstd::string, Def MapType;
+#else
typedef std::mapstd::string, Def MapType;
+#endif
MapType Map;
// Internal query and update methods.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b21705d534c16a6197f28db68ea81e2816bfec3
commit 3b21705d534c16a6197f28db68ea81e2816bfec3
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Mar 12 14:03:41 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jun 9 14:46:45 2014 -0400
cmDefinitions: Avoid a find-then-insert when setting variables
Searching the map is not necessary.
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 98becf8..6502163 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -50,16 +50,7 @@ cmDefinitions::SetInternal(const std::string key, Def
const def)
if(this-Up || def.Exists)
{
// In lower scopes we store keys, defined or not.
-MapType::iterator i = this-Map.find(key);
-if(i == this-Map.end())
- {
- i = this-Map.insert(MapType::value_type(key, def)).first;
- }
-else
- {
- i-second = def;
- }
-return i-second;
+return (this-Map[key] = def);
}
else
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49
commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Mar 12 14:01:45 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jun 9 14:46:45 2014 -0400
cmDefinitions: Don't store parent lookups
When looking up scopes, it is faster to not store the lookup locally to
keep the maps smaller and avoid extra allocations and rebalancing.
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index babf1c4..98becf8 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -28,7 +28,7
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3679-gf93a85c
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 f93a85c96a332146137defdd3cd062d7b18b0133 (commit)
via 1b003c1f9542ec3bb638b1b16de6d85a424f1c53 (commit)
via 7492a7b8465d28c7f4377372153ef1e10ff336d5 (commit)
via 3e7194a215aed5e34acf32ad4b8c6bd948beb15e (commit)
from 0fe910f07c8871b94486986e9875dba033df5b8f (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f93a85c96a332146137defdd3cd062d7b18b0133
commit f93a85c96a332146137defdd3cd062d7b18b0133
Merge: 0fe910f 1b003c1
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Jun 9 14:46:27 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 9 14:46:27 2014 -0400
Merge topic 'dev/static-regex' into next
1b003c1f cmTarget: Remove an unused variable
7492a7b8 regex: Search on strings where possible
3e7194a2 regex: Use static regexs where possible
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b003c1f9542ec3bb638b1b16de6d85a424f1c53
commit 1b003c1f9542ec3bb638b1b16de6d85a424f1c53
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Apr 30 13:13:39 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jun 9 14:45:35 2014 -0400
cmTarget: Remove an unused variable
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 59cc14c..058e661 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6145,7 +6145,6 @@ void processILibs(const std::string config,
if (emitted.insert(tgt).second)
{
tgts.push_back(tgt);
- std::vectorstd::string ilibs;
cmTarget::LinkInterface const* iface =
tgt-GetLinkInterfaceLibraries(config, headTarget);
if (iface)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7492a7b8465d28c7f4377372153ef1e10ff336d5
commit 7492a7b8465d28c7f4377372153ef1e10ff336d5
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Apr 30 13:13:21 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Jun 9 14:45:35 2014 -0400
regex: Search on strings where possible
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 70f02d6..0ce04a5 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1811,7 +1811,7 @@
cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const fullPath)
}
}
- is_shared_library = this-ExtractSharedLibraryName.find(file.c_str());
+ is_shared_library = this-ExtractSharedLibraryName.find(file);
if(!is_shared_library)
{
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 07362c3..7dcb335 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -402,7 +402,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
return compilerId ? compilerId : ;
}
static cmsys::RegularExpression compilerIdValidator(^[A-Za-z0-9_]*$);
-if (!compilerIdValidator.find(parameters.begin()-c_str()))
+if (!compilerIdValidator.find(*parameters.begin()))
{
reportError(context, content-GetOriginalExpression(),
Expression syntax not recognized.);
@@ -509,7 +509,7 @@ struct CompilerVersionNode : public
cmGeneratorExpressionNode
}
static cmsys::RegularExpression compilerIdValidator(^[0-9\\.]*$);
-if (!compilerIdValidator.find(parameters.begin()-c_str()))
+if (!compilerIdValidator.find(*parameters.begin()))
{
reportError(context, content-GetOriginalExpression(),
Expression syntax not recognized.);
@@ -710,7 +710,7 @@ static const struct ConfigurationTestNode : public
cmGeneratorExpressionNode
return configurationNode.Evaluate(parameters, context, content, 0);
}
static cmsys::RegularExpression configValidator(^[A-Za-z0-9_]*$);
-if (!configValidator.find(parameters.begin()-c_str()))
+if (!configValidator.find(*parameters.begin()))
{
reportError(context, content-GetOriginalExpression(),
Expression syntax not recognized.);
@@ -969,7 +969,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
return std::string();
}
-if (!propertyNameValidator.find(propertyName.c_str()))
+if (!propertyNameValidator.find(propertyName))
{
::reportError(context, content-GetOriginalExpression(),
Property name not supported.);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3574-g97ef2d8
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 97ef2d89293276e90083868347ca13b5f233643b (commit) via 7db77a828a3c79c5dce476b78e759478756ca091 (commit) from 97ef74ea760b23ef6a7d32038477a59d5fb14fb9 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97ef2d89293276e90083868347ca13b5f233643b commit 97ef2d89293276e90083868347ca13b5f233643b Merge: 97ef74e 7db77a8 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Jun 5 12:43:43 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jun 5 12:43:43 2014 -0400 Merge topic 'dev/fix-complex-tests' into next 7db77a82 tests: allow RelWithDebInfo and MinSizeRel configs to work http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db77a828a3c79c5dce476b78e759478756ca091 commit 7db77a828a3c79c5dce476b78e759478756ca091 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Jun 5 12:42:13 2014 -0400 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu Jun 5 12:42:13 2014 -0400 tests: allow RelWithDebInfo and MinSizeRel configs to work diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 5fa46bf..50c 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -83,6 +83,14 @@ set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_RELEASE CMAKE_IS_FUN_IN_RELEASE_MODE ) +set_property(DIRECTORY + PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO + CMAKE_IS_FUN_IN_RELEASE_MODE + ) +set_property(DIRECTORY + PROPERTY COMPILE_DEFINITIONS_MINSIZEREL + CMAKE_IS_FUN_IN_RELEASE_MODE + ) set(TEST_SEP a b c) separate_arguments(TEST_SEP) diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index d3d9132..3f17dcc 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -83,6 +83,14 @@ set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_RELEASE CMAKE_IS_FUN_IN_RELEASE_MODE ) +set_property(DIRECTORY + PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO + CMAKE_IS_FUN_IN_RELEASE_MODE + ) +set_property(DIRECTORY + PROPERTY COMPILE_DEFINITIONS_MINSIZEREL + CMAKE_IS_FUN_IN_RELEASE_MODE + ) set(TEST_SEP a b c) separate_arguments(TEST_SEP) --- Summary of changes: Tests/Complex/CMakeLists.txt |8 Tests/ComplexOneConfig/CMakeLists.txt |8 2 files changed, 16 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3590-g17ae4b5
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 17ae4b589e7d71f80d2c84616c4e7a3888c4e98b (commit)
via 8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c (commit)
from 537384eef1a6f02f557004992fd3f40c834ddbd5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17ae4b589e7d71f80d2c84616c4e7a3888c4e98b
commit 17ae4b589e7d71f80d2c84616c4e7a3888c4e98b
Merge: 537384e 8a3c081
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jun 5 16:30:52 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 5 16:30:52 2014 -0400
Merge topic 'dev/fix-externaldata-with-symlink-in-source-path' into next
8a3c081b ExternalData: determine the data path properly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c
commit 8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Jun 5 16:28:53 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Jun 5 16:28:53 2014 -0400
ExternalData: determine the data path properly
The data file itself does not exist, so REALPATH does not work. Instead,
split it into a directory and name, REALPATH the directory, then put it
back together. Just using ABSOLUTE does not work because
CMAKE_SOURCE_DIR uses REALPATH while ${project}_SOURCE_DIR uses
ABSOLUTE. If these are not the same, the out-of-source DATA file
detection gives a false-alarm.
diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index 73a4990..d031e07 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -383,7 +383,10 @@ function(_ExternalData_arg target arg options var_file)
else()
set(absdata ${CMAKE_CURRENT_SOURCE_DIR}/${data})
endif()
- get_filename_component(absdata ${absdata} ABSOLUTE)
+ get_filename_component(absdir ${absdata} DIRECTORY)
+ get_filename_component(absdir ${absdir} REALPATH)
+ get_filename_component(absname ${absdata} NAME)
+ set(absdata ${absdir}/${absname})
# Convert to relative path under the source tree.
if(NOT ExternalData_SOURCE_ROOT)
---
Summary of changes:
Modules/ExternalData.cmake |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3378-gcd91e99
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 cd91e99eeb02ec15a65deb5b2d840895f1032fad (commit)
via 88962807c25a928065cb92d0dd3ccfae84569689 (commit)
from 70459c917e6cfbe265d58dba229aa49b22eac74f (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd91e99eeb02ec15a65deb5b2d840895f1032fad
commit cd91e99eeb02ec15a65deb5b2d840895f1032fad
Merge: 70459c9 8896280
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 27 14:32:24 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 14:32:24 2014 -0400
Merge topic 'revert/old-backtrace-performance' into next
88962807 revert old backtrace-performance changes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88962807c25a928065cb92d0dd3ccfae84569689
commit 88962807c25a928065cb92d0dd3ccfae84569689
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 27 14:31:22 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue May 27 14:31:29 2014 -0400
revert old backtrace-performance changes
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index 6f36940..eb62455 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -386,10 +386,15 @@ void cmComputeTargetDepends::AddTargetDepend(int
depender_index,
e The dependency target \ dependee_name
\ of target \ depender-GetName() \ does not exist.;
- cmListFileBacktrace backtrace =
+ cmListFileBacktrace nullBacktrace;
+ cmListFileBacktrace const* backtrace =
depender-GetUtilityBacktrace(dependee_name);
+ if(!backtrace)
+{
+backtrace = nullBacktrace;
+}
- cm-IssueMessage(messageType, e.str(), backtrace);
+ cm-IssueMessage(messageType, e.str(), *backtrace);
}
}
diff --git a/Source/cmExportBuildFileGenerator.cxx
b/Source/cmExportBuildFileGenerator.cxx
index 647bbca..6c8ebb6 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -46,7 +46,6 @@ bool
cmExportBuildFileGenerator::GenerateMainFile(std::ostream os)
{
cmOStringStream e;
e given target \ te-GetName() \ more than once.;
- this-Backtrace.MakeRelative();
this-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
return false;
@@ -318,7 +317,6 @@ cmExportBuildFileGenerator
e If the required target is not easy to reference in this call,
consider using the APPEND option with multiple separate calls.;
- this-Backtrace.MakeRelative();
this-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
}
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx
b/Source/cmGeneratorExpressionDAGChecker.cxx
index 8882d5f..7f8e694 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -91,11 +91,9 @@ void cmGeneratorExpressionDAGChecker::ReportError(
expr \n
Self reference on target \
context-HeadTarget-GetName() \.\n;
-cmListFileBacktrace backtrace = parent-Backtrace;
-backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
- backtrace);
+ parent-Backtrace);
return;
}
@@ -104,7 +102,6 @@ void cmGeneratorExpressionDAGChecker::ReportError(
e Error evaluating generator expression:\n
expr \n
Dependency loop found.;
- context-Backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
context-Backtrace);
@@ -118,11 +115,9 @@ void cmGeneratorExpressionDAGChecker::ReportError(
(parent-Content ? parent-Content-GetOriginalExpression() : expr)
\n;
-cmListFileBacktrace backtrace = parent-Backtrace;
-backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
- backtrace);
+ parent-Backtrace);
parent = parent-Parent;
++loopStep;
}
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 33315c6..0b357f6 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -40,7 +40,6 @@ void reportError(cmGeneratorExpressionContext *context,
e Error evaluating generator expression:\n
expr \n
result
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3321-g1fb7afd
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 1fb7afd70b23d3260a91c378f7d16c52ae469d1e (commit)
via 9ba91463e61b1e4ff5b3dcdea82981f65097e7dd (commit)
from fb5f018c0321375c9a8427fa0a60b03f1dab4440 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fb7afd70b23d3260a91c378f7d16c52ae469d1e
commit 1fb7afd70b23d3260a91c378f7d16c52ae469d1e
Merge: fb5f018 9ba9146
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 22 11:13:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 22 11:13:38 2014 -0400
Merge topic 'dev/CMP0053-variable_watch' into next
9ba91463 tests: test CMP0053 in WARN mode when watching variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ba91463e61b1e4ff5b3dcdea82981f65097e7dd
commit 9ba91463e61b1e4ff5b3dcdea82981f65097e7dd
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 20 17:00:28 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 22 11:13:29 2014 -0400
tests: test CMP0053 in WARN mode when watching variables
When CMP0053 is in WARN mode, variables get expanded twice, leaking the
fact that the string was expanded twice and changing behavior. Instead,
suppress variable watches when running the expansion to trigger the
CMP0053 warning.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9f33b92..3510dcb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -103,6 +103,7 @@ cmMakefile::cmMakefile(): Internal(new Internals)
this-GeneratingBuildSystem = false;
this-NumLastMatches = 0;
+ this-SuppressWatches = false;
}
cmMakefile::cmMakefile(const cmMakefile mf): Internal(new Internals)
@@ -153,6 +154,7 @@ cmMakefile::cmMakefile(const cmMakefile mf): Internal(new
Internals)
this-OutputToSource = mf.OutputToSource;
this-NumLastMatches = mf.NumLastMatches;
+ this-SuppressWatches = mf.SuppressWatches;
}
//
@@ -2463,7 +2465,7 @@ const char* cmMakefile::GetDefinition(const std::string
name) const
}
#ifdef CMAKE_BUILD_WITH_CMAKE
cmVariableWatch* vv = this-GetVariableWatch();
- if ( vv )
+ if ( vv !this-SuppressWatches )
{
if ( def )
{
@@ -2570,10 +2572,14 @@ const char
*cmMakefile::ExpandVariablesInString(std::string source,
original = source;
newResult = source;
compareResults = true;
+ // Suppress variable watches to avoid calling hooks twice. Suppress new
+ // dereferences since the OLD behavior is still what is actually used.
+ this-SuppressWatches = true;
newError =
ExpandVariablesInStringNew(newErrorstr, newResult, escapeQuotes,
noEscapes, atOnly, filename, line,
removeEmpty, replaceAt);
+ this-SuppressWatches = false;
}
case cmPolicies::OLD:
mtype = ExpandVariablesInStringOld(errorstr, source, escapeQuotes,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 11904a6..9a4b9c7 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -1127,6 +1127,8 @@ private:
const std::string feature) const;
bool HaveCxxFeatureAvailable(cmTarget const* target,
const std::string feature) const;
+
+ mutable bool SuppressWatches;
};
//
diff --git a/Tests/RunCMake/CMP0053/CMP0053-NEW-stderr.txt
b/Tests/RunCMake/CMP0053/CMP0053-NEW-stderr.txt
new file mode 100644
index 000..836b0ff
--- /dev/null
+++ b/Tests/RunCMake/CMP0053/CMP0053-NEW-stderr.txt
@@ -0,0 +1,2 @@
+^called
+$
diff --git a/Tests/RunCMake/CMP0053/CMP0053-NEW.cmake
b/Tests/RunCMake/CMP0053/CMP0053-NEW.cmake
new file mode 100644
index 000..6ffedc6
--- /dev/null
+++ b/Tests/RunCMake/CMP0053/CMP0053-NEW.cmake
@@ -0,0 +1,8 @@
+cmake_policy(SET CMP0053 NEW)
+
+function (watch_callback)
+ message(called)
+endfunction ()
+
+variable_watch(test watch_callback)
+message(--${test}--)
diff --git a/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt
b/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt
new file mode 100644
index 000..836b0ff
--- /dev/null
+++ b/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt
@@ -0,0 +1,2 @@
+^called
+$
diff --git a/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake
b/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake
new file mode 100644
index 000..41f5347
--- /dev/null
+++ b/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake
@@ -0,0 +1,8
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3329-gb012bca
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 b012bca18bd5680bc5a1eac950f2e867d1cb88ae (commit)
via 4ded15208b63dcbb3a04bda6d488a4b8dce219e8 (commit)
via b8144963278002a81944e043235b3f766a2843f0 (commit)
from 58563438a4c1a34d2a616c744efe9b9f8c37614d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b012bca18bd5680bc5a1eac950f2e867d1cb88ae
commit b012bca18bd5680bc5a1eac950f2e867d1cb88ae
Merge: 5856343 4ded152
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 22 12:50:06 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 22 12:50:06 2014 -0400
Merge topic 'dev/backtrace-performance' into next
4ded1520 cmListFileBacktrace: Add a MakeRelative method
b8144963 cmMakefile: Convert to local paths in IssueMessage
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ded15208b63dcbb3a04bda6d488a4b8dce219e8
commit 4ded15208b63dcbb3a04bda6d488a4b8dce219e8
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Mar 21 21:14:43 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 22 11:33:56 2014 -0400
cmListFileBacktrace: Add a MakeRelative method
This allows deferring backtraces until the moment when a relative path
is actually necessary. Unfortunately, not only cmMakefile issues
messages, so any caller of cmake::IssueMessage has to make the backtrace
relative as well.
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index eb62455..6f36940 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -386,15 +386,10 @@ void cmComputeTargetDepends::AddTargetDepend(int
depender_index,
e The dependency target \ dependee_name
\ of target \ depender-GetName() \ does not exist.;
- cmListFileBacktrace nullBacktrace;
- cmListFileBacktrace const* backtrace =
+ cmListFileBacktrace backtrace =
depender-GetUtilityBacktrace(dependee_name);
- if(!backtrace)
-{
-backtrace = nullBacktrace;
-}
- cm-IssueMessage(messageType, e.str(), *backtrace);
+ cm-IssueMessage(messageType, e.str(), backtrace);
}
}
diff --git a/Source/cmExportBuildFileGenerator.cxx
b/Source/cmExportBuildFileGenerator.cxx
index 6c8ebb6..647bbca 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -46,6 +46,7 @@ bool
cmExportBuildFileGenerator::GenerateMainFile(std::ostream os)
{
cmOStringStream e;
e given target \ te-GetName() \ more than once.;
+ this-Backtrace.MakeRelative();
this-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
return false;
@@ -317,6 +318,7 @@ cmExportBuildFileGenerator
e If the required target is not easy to reference in this call,
consider using the APPEND option with multiple separate calls.;
+ this-Backtrace.MakeRelative();
this-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
}
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx
b/Source/cmGeneratorExpressionDAGChecker.cxx
index 7f8e694..8882d5f 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -91,9 +91,11 @@ void cmGeneratorExpressionDAGChecker::ReportError(
expr \n
Self reference on target \
context-HeadTarget-GetName() \.\n;
+cmListFileBacktrace backtrace = parent-Backtrace;
+backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
- parent-Backtrace);
+ backtrace);
return;
}
@@ -102,6 +104,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
e Error evaluating generator expression:\n
expr \n
Dependency loop found.;
+ context-Backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
context-Backtrace);
@@ -115,9 +118,11 @@ void cmGeneratorExpressionDAGChecker::ReportError(
(parent-Content ? parent-Content-GetOriginalExpression() : expr)
\n;
+cmListFileBacktrace backtrace = parent-Backtrace;
+backtrace.MakeRelative();
context-Makefile-GetCMakeInstance()
-IssueMessage(cmake::FATAL_ERROR, e.str(),
- parent-Backtrace);
+ backtrace);
parent = parent-Parent;
++loopStep
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3291-g711d6bd
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 711d6bd183a1fe9bfc7faf66380003f0e9eeca4e (commit)
via 8171172474e6ec0a90131918a89a529690200643 (commit)
from cd27123d257999660aac9269887af2d7a3482022 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=711d6bd183a1fe9bfc7faf66380003f0e9eeca4e
commit 711d6bd183a1fe9bfc7faf66380003f0e9eeca4e
Merge: cd27123 8171172
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed May 21 13:27:11 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 21 13:27:11 2014 -0400
Merge topic 'dev/watch-variable-allowed-access-type' into next
81711724 watch_variable: Remove excess access type
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8171172474e6ec0a90131918a89a529690200643
commit 8171172474e6ec0a90131918a89a529690200643
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed May 21 13:25:27 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed May 21 13:25:27 2014 -0400
watch_variable: Remove excess access type
The ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS access type was switched on an
undocumented variable and its lookup caused an unnecessary performance
impact.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index f1717a0..136cf5c 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -105,4 +105,3 @@ All Policies
/policy/CMP0051
/policy/CMP0052
/policy/CMP0053
- /policy/CMP0054
diff --git a/Help/policy/CMP0054.rst b/Help/policy/CMP0054.rst
deleted file mode 100644
index 7c2b2c3..000
--- a/Help/policy/CMP0054.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-CMP0054
-
-Deprecate `ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS` :command:`variable_watch`
-access type.
-
-CMake 3.0 and lower allowed switching the access type of variable access to
-`ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS` based on the undocumented
-`CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS` variable. Since the callback is
-always called no matter what, just with a different access type based on this
-variable, the access types are now collapsed into one.
-
-The OLD behavior for this policy is to use the
-`ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS` access type based on the
-`CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS` variable. The NEW behavior for this
-policy is to always use `UNKNOWN_VARIABLE_READ_ACCESS` as the access type.
-
-This policy was introduced in CMake version 3.1.
-CMake version |release| warns when the policy is not set and uses
-``OLD`` behavior. Use the :command:`cmake_policy` command to set it
-to ``OLD`` or ``NEW`` explicitly.
diff --git a/Help/release/dev/watch-variable-policy.rst
b/Help/release/dev/watch-variable-policy.rst
index 0d96fb7..ab495ab 100644
--- a/Help/release/dev/watch-variable-policy.rst
+++ b/Help/release/dev/watch-variable-policy.rst
@@ -1,5 +1,4 @@
watch-variable-policy
-
-* Policy :policy:`CMP0054` introduced to improve variable lookup performance
- for uninitialized variables.
+* Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS access type in variable_watch.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 382767d..9b7290b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2472,46 +2472,8 @@ const char* cmMakefile::GetDefinition(const std::string
name) const
}
else
{
- int type = cmVariableWatch::UNKNOWN_VARIABLE_READ_ACCESS;
- switch(this-GetPolicyStatus(cmPolicies::CMP0054))
-{
-case cmPolicies::WARN:
-{
- // Warn if necessary.
- const char* allow = this-Internal-VarStack.top()
-.Get(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS);
- if(cmSystemTools::IsOn(allow))
-{
-this-IssueMessage(cmake::AUTHOR_WARNING,
- this-GetPolicies()-GetPolicyWarning(cmPolicies::CMP0054));
-// Checking again is unnecessary and doubly expensive (and the
-// reason for the policy...); just duplicate the old behavior here.
-type = cmVariableWatch::ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS;
-}
- break;
-}
-case cmPolicies::OLD:
-{
- // OLD behavior is to use ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS if
- // needed.
- const char* allow = this-Internal-VarStack.top()
-.Get(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS);
- if(cmSystemTools::IsOn(allow))
-{
-type = cmVariableWatch::ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3293-g18d6097
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 18d6097fc5892545400de1d37e9d0b219aee7bd6 (commit)
via daa854c7bc28f0d71d7fa8f8254b4fcca841e2d0 (commit)
from 711d6bd183a1fe9bfc7faf66380003f0e9eeca4e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d6097fc5892545400de1d37e9d0b219aee7bd6
commit 18d6097fc5892545400de1d37e9d0b219aee7bd6
Merge: 711d6bd daa854c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed May 21 13:28:01 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 21 13:28:01 2014 -0400
Merge topic 'dev/watch-variable-allowed-access-type' into next
daa854c7 watch_variable: Remove excess access type
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daa854c7bc28f0d71d7fa8f8254b4fcca841e2d0
commit daa854c7bc28f0d71d7fa8f8254b4fcca841e2d0
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 17:25:24 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed May 21 13:27:35 2014 -0400
watch_variable: Remove excess access type
The ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS access type was switched on an
undocumented variable and its lookup caused an unnecessary performance
impact.
diff --git a/Help/release/dev/watch-variable-policy.rst
b/Help/release/dev/watch-variable-policy.rst
new file mode 100644
index 000..ab495ab
--- /dev/null
+++ b/Help/release/dev/watch-variable-policy.rst
@@ -0,0 +1,4 @@
+watch-variable-policy
+-
+
+* Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS access type in variable_watch.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 90a7b0b..9b7290b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2472,19 +2472,8 @@ const char* cmMakefile::GetDefinition(const std::string
name) const
}
else
{
- // are unknown access allowed
- const char* allow = this-Internal-VarStack.top()
-.Get(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS);
- if(cmSystemTools::IsOn(allow))
-{
-vv-VariableAccessed(name,
- cmVariableWatch::ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS, def, this);
-}
- else
-{
-vv-VariableAccessed(name,
+ vv-VariableAccessed(name,
cmVariableWatch::UNKNOWN_VARIABLE_READ_ACCESS, def, this);
-}
}
}
#endif
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3267-g2bcdb80
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 2bcdb80ed7e68afc491dd752b4847818dafdba46 (commit)
via 6a6f2b63a23914ed6d41324f4b536eb82d02dd55 (commit)
via c0e4340a2c2043af76efbadf5f655907720d13fe (commit)
from a0c533f27dd8bcb7fbfc9521de5b25ac7f12a738 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bcdb80ed7e68afc491dd752b4847818dafdba46
commit 2bcdb80ed7e68afc491dd752b4847818dafdba46
Merge: a0c533f 6a6f2b6
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 20 13:36:09 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 20 13:36:09 2014 -0400
Merge topic 'dev/watch-variable-policy' into next
6a6f2b63 tests: test CMP0054
c0e4340a CMP0054: Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a6f2b63a23914ed6d41324f4b536eb82d02dd55
commit 6a6f2b63a23914ed6d41324f4b536eb82d02dd55
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 17:46:48 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue May 13 16:18:19 2014 -0400
tests: test CMP0054
diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW-result.txt
b/Tests/RunCMake/CMP0054/CMP0054-NEW-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-NEW-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt
b/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt
new file mode 100644
index 000..ea1cc74
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt
@@ -0,0 +1,4 @@
+^UNKNOWN_READ_ACCESS
+
+UNKNOWN_READ_ACCESS
+$
diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
new file mode 100644
index 000..259e598
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
@@ -0,0 +1,12 @@
+cmake_policy(SET CMP0054 NEW)
+
+function (watch_callback var access value file stack)
+ message(${access})
+endfunction ()
+
+variable_watch(uninit watch_callback)
+message(--${uninit}--)
+set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS ON)
+message(--${uninit}--)
+# Don't warn during generate
+set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS OFF)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD-result.txt
b/Tests/RunCMake/CMP0054/CMP0054-OLD-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-OLD-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt
b/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt
new file mode 100644
index 000..50d6c11
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt
@@ -0,0 +1,4 @@
+^UNKNOWN_READ_ACCESS
+
+ALLOWED_UNKNOWN_READ_ACCESS
+$
diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
new file mode 100644
index 000..893dc7b
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
@@ -0,0 +1,12 @@
+cmake_policy(SET CMP0054 OLD)
+
+function (watch_callback var access value file stack)
+ message(${access})
+endfunction ()
+
+variable_watch(uninit watch_callback)
+message(--${uninit}--)
+set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS ON)
+message(--${uninit}--)
+# Don't warn during generate
+set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS OFF)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-result.txt
b/Tests/RunCMake/CMP0054/CMP0054-WARN-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
new file mode 100644
index 000..db5f8d0
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
@@ -0,0 +1,13 @@
+^UNKNOWN_READ_ACCESS
+
+CMake Warning \(dev\) at CMP0054-WARN.cmake:8 \(message\):
+ Policy CMP0054 is not set: Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS
+ variable_watch access type. Run cmake --help-policy CMP0054 for policy
+ details. Use the cmake_policy command to set the policy and suppress this
+ warning.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+ALLOWED_UNKNOWN_READ_ACCESS
+$
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
new file mode 100644
index 000..fde0538
--- /dev/null
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
@@ -0,0 +1,10 @@
+function (watch_callback var access value file stack)
+ message
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3269-g5ff359a
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 5ff359aa44572a4e99336c71ebe5ac53e337235a (commit)
via fee23565dff050012998d1fa4c0efb31e1433897 (commit)
from 2bcdb80ed7e68afc491dd752b4847818dafdba46 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ff359aa44572a4e99336c71ebe5ac53e337235a
commit 5ff359aa44572a4e99336c71ebe5ac53e337235a
Merge: 2bcdb80 fee2356
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 20 16:52:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 20 16:52:53 2014 -0400
Merge topic 'dev/watch-variable-policy' into next
fee23565 tests: set CMP0053 in CMP0054 tests to NEW
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fee23565dff050012998d1fa4c0efb31e1433897
commit fee23565dff050012998d1fa4c0efb31e1433897
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 20 16:52:02 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue May 20 16:52:02 2014 -0400
tests: set CMP0053 in CMP0054 tests to NEW
Without this, the variable will be expanded twice which will cause
different output due to the watch_variable expansions.
diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
index 259e598..e4ee597 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
cmake_policy(SET CMP0054 NEW)
function (watch_callback var access value file stack)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
index 893dc7b..d8a4fc9 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
cmake_policy(SET CMP0054 OLD)
function (watch_callback var access value file stack)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
index db5f8d0..987666f 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
@@ -1,6 +1,6 @@
^UNKNOWN_READ_ACCESS
-CMake Warning \(dev\) at CMP0054-WARN.cmake:8 \(message\):
+CMake Warning \(dev\) at CMP0054-WARN.cmake:10 \(message\):
Policy CMP0054 is not set: Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS
variable_watch access type. Run cmake --help-policy CMP0054 for policy
details. Use the cmake_policy command to set the policy and suppress this
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
index fde0538..25afc14 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
@@ -1,3 +1,5 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
+
function (watch_callback var access value file stack)
message(${access})
endfunction ()
---
Summary of changes:
Tests/RunCMake/CMP0054/CMP0054-NEW.cmake |1 +
Tests/RunCMake/CMP0054/CMP0054-OLD.cmake |1 +
Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt |2 +-
Tests/RunCMake/CMP0054/CMP0054-WARN.cmake |2 ++
4 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2993-g710e2e6
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 710e2e6015099b279c2a46c548b17d0ec4365c10 (commit)
via 2583eff6fe34f219a017c973c9e3bf12eb503178 (commit)
via 18e478a860ce480f47ca2fdf583f3c5d65f93ccf (commit)
via 6fa6bedf78981d336b66d55ca10a1d290d014101 (commit)
from 8adaae39bae1c275a172b61006a3172b94abecbd (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=710e2e6015099b279c2a46c548b17d0ec4365c10
commit 710e2e6015099b279c2a46c548b17d0ec4365c10
Merge: 8adaae3 2583eff
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed May 7 14:24:42 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 7 14:24:42 2014 -0400
Merge topic 'dev/refactor-source-depends-in-ninja' into next
2583eff6 ninja: Factor out custom command order-only depends
18e478a8 ninja: Factor out target-level order-only dependencies
6fa6bedf LocalGenerator: Add a string overload for AppendFlags
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2583eff6fe34f219a017c973c9e3bf12eb503178
commit 2583eff6fe34f219a017c973c9e3bf12eb503178
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Mon Mar 10 21:07:31 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed May 7 14:30:31 2014 -0400
ninja: Factor out custom command order-only depends
This makes WebKitGTK's CMake build.ninja file go from 165M to 11M and
configure/generate in 5 seconds.
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 0b379bd..292a22f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -502,7 +502,7 @@ cmNinjaTargetGenerator
this-GetLocalGenerator()-AddCustomCommandTarget(cc, this-GetTarget());
// Record the custom commands for this target. The container is used
// in WriteObjectBuildStatement when called in a loop below.
- this-CustomCommands.push_back((*si)-GetCustomCommand());
+ this-CustomCommands.push_back(cc);
}
std::vectorcmSourceFile const* headerSources;
this-GeneratorTarget-GetHeaderSources(headerSources, config);
@@ -525,6 +525,20 @@ cmNinjaTargetGenerator
cmNinjaDeps orderOnlyDeps;
this-GetLocalGenerator()-AppendTargetDepends(this-Target, orderOnlyDeps);
+
+ // Add order-only dependencies on custom command outputs.
+ for(std::vectorcmCustomCommand const*::const_iterator
+cci = this-CustomCommands.begin();
+ cci != this-CustomCommands.end(); ++cci)
+{
+cmCustomCommand const* cc = *cci;
+cmCustomCommandGenerator ccg(*cc, this-GetConfigName(),
+ this-GetMakefile());
+const std::vectorstd::string ccoutputs = ccg.GetOutputs();
+std::transform(ccoutputs.begin(), ccoutputs.end(),
+ std::back_inserter(orderOnlyDeps), MapToNinjaPath());
+}
+
cmNinjaDeps orderOnlyTarget;
orderOnlyTarget.push_back(this-OrderDependsTargetForTarget());
this-GetGlobalGenerator()-WritePhonyBuild(this-GetBuildFileStream(),
@@ -584,19 +598,6 @@ cmNinjaTargetGenerator
cmNinjaDeps orderOnlyDeps;
orderOnlyDeps.push_back(this-OrderDependsTargetForTarget());
- // Add order-only dependencies on custom command outputs.
- for(std::vectorcmCustomCommand const*::const_iterator
-cci = this-CustomCommands.begin();
- cci != this-CustomCommands.end(); ++cci)
-{
-cmCustomCommand const* cc = *cci;
-cmCustomCommandGenerator ccg(*cc, this-GetConfigName(),
- this-GetMakefile());
-const std::vectorstd::string ccoutputs = ccg.GetOutputs();
-std::transform(ccoutputs.begin(), ccoutputs.end(),
- std::back_inserter(orderOnlyDeps), MapToNinjaPath());
-}
-
// If the source file is GENERATED and does not have a custom command
// (either attached to this source file or another one), assume that one of
// the target dependencies, OBJECT_DEPENDS or header file custom commands
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18e478a860ce480f47ca2fdf583f3c5d65f93ccf
commit 18e478a860ce480f47ca2fdf583f3c5d65f93ccf
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Mar 10 18:48:46 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed May 7 14:30:31 2014 -0400
ninja: Factor out target-level order-only dependencies
This reduces ninja file output even more for projects with lots of
libraries with entangled transitive dependencies. ParaView goes from the
previous 58M to about 45M.
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3012-g234ee0d
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 234ee0d30eb1c8ff56f8f10f296380788fb5c001 (commit)
via 325599caa2974f30d35f9ad0dbe1fc0760290b3e (commit)
via ac4106c69abea254e6a887dd42997fcdaca3a001 (commit)
from 2fb3919f6c8c4582d9ca641f9ccea486d1fa2fae (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=234ee0d30eb1c8ff56f8f10f296380788fb5c001
commit 234ee0d30eb1c8ff56f8f10f296380788fb5c001
Merge: 2fb3919 325599c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed May 7 15:42:58 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 7 15:42:58 2014 -0400
Merge topic 'dev/hashmap-for-targets' into next
325599ca cmGlobalGenerator: Store targets in hash maps
ac4106c6 cmMakefile: Use a hashmap for imported targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=325599caa2974f30d35f9ad0dbe1fc0760290b3e
commit 325599caa2974f30d35f9ad0dbe1fc0760290b3e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Apr 30 15:40:39 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed May 7 15:48:32 2014 -0400
cmGlobalGenerator: Store targets in hash maps
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f09f7b3..4bdec3f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2070,15 +2070,13 @@ cmGlobalGenerator::FindTarget(const std::string name,
{
if (!excludeAliases)
{
-std::mapstd::string, cmTarget*::const_iterator ai
-= this-AliasTargets.find(name);
+TargetMap::const_iterator ai = this-AliasTargets.find(name);
if (ai != this-AliasTargets.end())
{
return ai-second;
}
}
- std::mapstd::string,cmTarget *::const_iterator i =
-this-TotalTargets.find ( name );
+ TargetMap::const_iterator i = this-TotalTargets.find ( name );
if ( i != this-TotalTargets.end() )
{
return i-second;
@@ -2859,7 +2857,7 @@ void cmGlobalGenerator::WriteSummary()
cmGeneratedFileStream fout(fname.c_str());
// Generate summary information files for each target.
- for(std::mapstd::string,cmTarget *::const_iterator ti =
+ for(TargetMap::const_iterator ti =
this-TotalTargets.begin(); ti != this-TotalTargets.end(); ++ti)
{
if ((ti-second)-GetType() == cmTarget::INTERFACE_LIBRARY)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 82fb1e5..14ec99a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -22,6 +22,10 @@
#include cmGeneratorTarget.h
#include cmGeneratorExpression.h
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+# include cmsys/hash_map.hxx
+#endif
+
class cmake;
class cmGeneratorTarget;
class cmGeneratorExpressionEvaluationFile;
@@ -389,9 +393,14 @@ protected:
cmTargetManifest TargetManifest;
// All targets in the entire project.
- std::mapstd::string,cmTarget * TotalTargets;
- std::mapstd::string,cmTarget * AliasTargets;
- std::mapstd::string,cmTarget * ImportedTargets;
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ typedef cmsys::hash_mapstd::string, cmTarget* TargetMap;
+#else
+ typedef std::mapstd::string,cmTarget * TargetMap;
+#endif
+ TargetMap TotalTargets;
+ TargetMap AliasTargets;
+ TargetMap ImportedTargets;
std::vectorcmGeneratorExpressionEvaluationFile* EvaluationFiles;
virtual const char* GetPredefinedTargetsFolder();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index e80df84..e6672a8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -341,7 +341,7 @@ void cmGlobalVisualStudio8Generator::Generate()
if(this-AddCheckTarget())
{
// All targets depend on the build-system check target.
-for(std::mapstd::string,cmTarget *::const_iterator
+for(TargetMap::const_iterator
ti = this-TotalTargets.begin();
ti != this-TotalTargets.end(); ++ti)
{
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b3975b4..d44da37 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1219,7 +1219,7 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
void cmGlobalXCodeGenerator::ForceLinkerLanguages()
{
// This makes sure all targets link using the proper language.
- for(std::mapstd::string, cmTarget*::const_iterator
+ for(TargetMap::const_iterator
ti = this-TotalTargets.begin(); ti != this-TotalTargets.end(); ++ti
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2809-g9ae2052
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 9ae20522b7afa771d9ecf23e05d42b0e85da636a (commit)
via c11d74bd02d0c529f74162d92d5b36bb500c4cb4 (commit)
from a1bcadbc7951500cf2116d49495fb385ea5ee8a3 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ae20522b7afa771d9ecf23e05d42b0e85da636a
commit 9ae20522b7afa771d9ecf23e05d42b0e85da636a
Merge: a1bcadb c11d74b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 6 14:14:33 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 6 14:14:33 2014 -0400
Merge topic 'dev/faster-evis' into next
c11d74bd tests: fix carriage return tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c11d74bd02d0c529f74162d92d5b36bb500c4cb4
commit c11d74bd02d0c529f74162d92d5b36bb500c4cb4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 6 14:20:28 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue May 6 14:20:28 2014 -0400
tests: fix carriage return tests
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
index 97bc4b6..d93b9db 100644
--- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
@@ -5,7 +5,7 @@
when parsing string
-\${var
with
carriagereturn}
+\${var\\rwith\\rcarriagereturn}
syntax error, unexpected cal_SYMBOL, expecting } \(26\)
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
index 5378865..bac69e4 100644
--- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
@@ -1 +1 @@
-message(${var
with
carriagereturn})
+message(${var\rwith\rcarriagereturn})
---
Summary of changes:
Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt |2 +-
Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2763-g78e86c7
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 78e86c77e56d19660926006e72272ba813b77a69 (commit)
via 60e4e38ce8b1e4a26b313043098a5af2dd9095a0 (commit)
from fa243d1f4129bf70cec3ef22f69df2f6e1189375 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78e86c77e56d19660926006e72272ba813b77a69
commit 78e86c77e56d19660926006e72272ba813b77a69
Merge: fa243d1 60e4e38
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 14:40:14 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 5 14:40:14 2014 -0400
Merge topic 'dev/refactor-source-depends-in-ninja' into next
60e4e38c LocalGenerator: explicitly overload AppendFlags
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60e4e38ce8b1e4a26b313043098a5af2dd9095a0
commit 60e4e38ce8b1e4a26b313043098a5af2dd9095a0
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 14:38:51 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon May 5 14:38:51 2014 -0400
LocalGenerator: explicitly overload AppendFlags
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 98097b9..94e45e5 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -972,6 +972,13 @@ void
cmLocalUnixMakefileGenerator3::AppendFlags(std::string flags,
}
//
+void cmLocalUnixMakefileGenerator3::AppendFlags(std::string flags,
+const char* newFlags)
+{
+ this-cmLocalGenerator::AppendFlags(flags, newFlags);
+}
+
+//
void
cmLocalUnixMakefileGenerator3
::AppendRuleDepend(std::vectorstd::string depends,
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index 0601245..4f2e4a0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,7 +169,7 @@ public:
// append flags to a string
virtual void AppendFlags(std::string flags, const std::string newFlags);
- using cmLocalGenerator::AppendFlags;
+ virtual void AppendFlags(std::string flags, const char* newFlags);
// append an echo command
enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx |7 +++
Source/cmLocalUnixMakefileGenerator3.h |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2769-g79386d8
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 79386d8516a11a0a86fd41f499aa397091497e7c (commit)
via 83477ff80c47f47b94feecf81ccdcb7a6400b141 (commit)
from afaf3a09711691fe44d73cfc0a09c466a19d2319 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79386d8516a11a0a86fd41f499aa397091497e7c
commit 79386d8516a11a0a86fd41f499aa397091497e7c
Merge: afaf3a0 83477ff
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 16:54:50 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 5 16:54:50 2014 -0400
Merge topic 'dev/faster-evis' into next
83477ff8 tests: more escaping tests for EVIS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83477ff80c47f47b94feecf81ccdcb7a6400b141
commit 83477ff80c47f47b94feecf81ccdcb7a6400b141
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon May 5 17:00:41 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon May 5 17:00:41 2014 -0400
tests: more escaping tests for EVIS
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
new file mode 100644
index 000..9575778
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithCarriageReturn.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
new file mode 100644
index 000..b8a403d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\rwith\rcarriagereturn})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
new file mode 100644
index 000..bb0d93f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\rwith\rcarriagereturn})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
new file mode 100644
index 000..41f86e6
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithNewline.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
new file mode 100644
index 000..45b532e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\nwith\nnewline})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
new file mode 100644
index 000..6fe568d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\nwith\nnewline})
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt
b/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt
b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt
new file mode 100644
index 000..7448b59
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt
@@ -0,0 +1,12 @@
+^CMake Error at NameWithCarriageReturn.cmake:1 \(message\):
+ Syntax error in cmake code at
+
+.*/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake:1
+
+ when parsing string
+
+\${var
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2724-g284d350
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 284d350f6450bdd39374a96717643fedcae4804d (commit)
via 9e9104dc4a9ae841cf19230c3221a18939ed9bc7 (commit)
via 19b3eb38acdab925cdd3a2b55a62579a8f45764e (commit)
via cc4bf45a2c63dacf1e2396d6f96ecbf5f4ac64cb (commit)
via 942a8c4552f2ad05be9228744a7c37bb1e25b089 (commit)
from 62b4dfbc433d7a1e4747ae749091dcf1ec298219 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=284d350f6450bdd39374a96717643fedcae4804d
commit 284d350f6450bdd39374a96717643fedcae4804d
Merge: 62b4dfb 9e9104d
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 12:52:00 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 12:52:00 2014 -0400
Merge topic 'dev/faster-evis' into next
9e9104dc tests: Test NUL and parentheses in CMP0053
19b3eb38 tests: Test other escape patterns
cc4bf45a EVIS: Disallow literal () in ENV variables
942a8c45 EVIS: Initialize t_lookup members
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e9104dc4a9ae841cf19230c3221a18939ed9bc7
commit 9e9104dc4a9ae841cf19230c3221a18939ed9bc7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 12:57:11 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 12:57:11 2014 -0400
tests: Test NUL and parentheses in CMP0053
Also remove them from StringFileTest since they belong in Syntax.
diff --git a/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
new file mode 100644
index 000..5ab2846c
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt
@@ -0,0 +1,40 @@
+^CMake Warning \(dev\) at CMP0053-NUL.cmake:1 \(set\):
+ Policy CMP0053 is not set: Simplify variable reference and escape sequence
+ evaluation. Run cmake --help-policy CMP0053 for policy details. Use the
+ cmake_policy command to set the policy and suppress this warning.
+
+Input: '\\0'
+Old behavior is accepted and the new behavior causes an error: 'Syntax
error in cmake code at
+.*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:1
+
+ when parsing string
+
+\\0
+
+ Invalid character escape '\\0'.'
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Warning \(dev\) at CMP0053-NUL.cmake:2 \(set\):
+ Policy CMP0053 is not set: Simplify variable reference and escape sequence
+ evaluation. Run cmake --help-policy CMP0053 for policy details. Use the
+ cmake_policy command to set the policy and suppress this warning.
+
+Input: '\\0'
+Old behavior is accepted and the new behavior causes an error: 'Syntax
error in cmake code at
+.*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:2
+
+ when parsing string
+
+\\0
+
+ Invalid character escape '\\0'.'
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+
+
+
+$
diff --git a/Tests/RunCMake/Syntax/CMP0053-NUL.cmake
b/Tests/RunCMake/Syntax/CMP0053-NUL.cmake
new file mode 100644
index 000..9ae0906
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NUL.cmake
@@ -0,0 +1,6 @@
+set(qnul \0)
+set(nul \0)
+message(--${nul}--)
+message(--${qnul}--)
+message(--${nul}--)
+message(--${qnul}--)
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt
new file mode 100644
index 000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt
@@ -0,0 +1 @@
+--value--
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
b/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
new file mode 100644
index 000..b5cdf0f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake
@@ -0,0 +1,3 @@
+cmake_policy(SET CMP0053 NEW)
+set(ENV{e(x)} value)
+message(--$ENV{e\(x\)}--)
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt
new file mode 100644
index 000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt
@@ -0,0 +1 @@
+--value--
diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
new file mode 100644
index 000..5559d4b
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake
@@ -0,0 +1,3 @@
+cmake_policy(SET CMP0053 NEW)
+set(ENV{e(x)} value)
+message(--$ENV{e\(x\)}--)
diff --git a/Tests/RunCMake/Syntax
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2730-gb4e3166
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 b4e3166d3b2c823b6ecdd1b77909d554dfc6 (commit)
via bc1aefd9643899d9598fd0204d7b6aff78e88637 (commit)
via c8a0cca5c818137f5b78c231534c8b3282c63ab2 (commit)
via 6f1753717d88e71790c4660fec69c316b6341632 (commit)
via 01b79c6385d32e635b5720d8075a60fd50577c66 (commit)
via 3c640891177923e71a0a50d26988a3595a0f3c43 (commit)
from 284d350f6450bdd39374a96717643fedcae4804d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4e3166d3b2c823b6ecdd1b77909d554dfc6
commit b4e3166d3b2c823b6ecdd1b77909d554dfc6
Merge: 284d350 bc1aefd
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:21:52 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 14:21:52 2014 -0400
Merge topic 'dev/refactor-source-depends-in-ninja' into next
bc1aefd9 ninja: Factor out custom command order-only depends
c8a0cca5 ninja: Factor out target-level order-only dependencies
6f175371 LocalGenerator: Add a string overload for AppendFlags
01b79c63 ninja: Don't use a stringstream to build an argument list
3c640891 ninja: Use string parameters
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc1aefd9643899d9598fd0204d7b6aff78e88637
commit bc1aefd9643899d9598fd0204d7b6aff78e88637
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Mon Mar 10 21:07:31 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 13:48:45 2014 -0400
ninja: Factor out custom command order-only depends
This makes WebKitGTK's CMake build.ninja file go from 165M to 11M and
configure/generate in 5 seconds.
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 0b379bd..292a22f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -502,7 +502,7 @@ cmNinjaTargetGenerator
this-GetLocalGenerator()-AddCustomCommandTarget(cc, this-GetTarget());
// Record the custom commands for this target. The container is used
// in WriteObjectBuildStatement when called in a loop below.
- this-CustomCommands.push_back((*si)-GetCustomCommand());
+ this-CustomCommands.push_back(cc);
}
std::vectorcmSourceFile const* headerSources;
this-GeneratorTarget-GetHeaderSources(headerSources, config);
@@ -525,6 +525,20 @@ cmNinjaTargetGenerator
cmNinjaDeps orderOnlyDeps;
this-GetLocalGenerator()-AppendTargetDepends(this-Target, orderOnlyDeps);
+
+ // Add order-only dependencies on custom command outputs.
+ for(std::vectorcmCustomCommand const*::const_iterator
+cci = this-CustomCommands.begin();
+ cci != this-CustomCommands.end(); ++cci)
+{
+cmCustomCommand const* cc = *cci;
+cmCustomCommandGenerator ccg(*cc, this-GetConfigName(),
+ this-GetMakefile());
+const std::vectorstd::string ccoutputs = ccg.GetOutputs();
+std::transform(ccoutputs.begin(), ccoutputs.end(),
+ std::back_inserter(orderOnlyDeps), MapToNinjaPath());
+}
+
cmNinjaDeps orderOnlyTarget;
orderOnlyTarget.push_back(this-OrderDependsTargetForTarget());
this-GetGlobalGenerator()-WritePhonyBuild(this-GetBuildFileStream(),
@@ -584,19 +598,6 @@ cmNinjaTargetGenerator
cmNinjaDeps orderOnlyDeps;
orderOnlyDeps.push_back(this-OrderDependsTargetForTarget());
- // Add order-only dependencies on custom command outputs.
- for(std::vectorcmCustomCommand const*::const_iterator
-cci = this-CustomCommands.begin();
- cci != this-CustomCommands.end(); ++cci)
-{
-cmCustomCommand const* cc = *cci;
-cmCustomCommandGenerator ccg(*cc, this-GetConfigName(),
- this-GetMakefile());
-const std::vectorstd::string ccoutputs = ccg.GetOutputs();
-std::transform(ccoutputs.begin(), ccoutputs.end(),
- std::back_inserter(orderOnlyDeps), MapToNinjaPath());
-}
-
// If the source file is GENERATED and does not have a custom command
// (either attached to this source file or another one), assume that one of
// the target dependencies, OBJECT_DEPENDS or header file custom commands
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a0cca5c818137f5b78c231534c8b3282c63ab2
commit c8a0cca5c818137f5b78c231534c8b3282c63ab2
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Mon Mar 10 18:48:46 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 13:48:45 2014 -0400
ninja: Factor out target-level order-only dependencies
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2733-g978901a
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 978901a9d20659eafa2dadbd0023efbbc7b9c953 (commit)
via 5de52931c6844ae2a6c4317badafaec999fe636b (commit)
via d16ae63650f047066b69966c7d1e502fe4f1601e (commit)
from b4e3166d3b2c823b6ecdd1b77909d554dfc6 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=978901a9d20659eafa2dadbd0023efbbc7b9c953
commit 978901a9d20659eafa2dadbd0023efbbc7b9c953
Merge: b4e3166 5de5293
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:22:57 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 14:22:57 2014 -0400
Merge topic 'dev/hashmap-for-targets' into next
5de52931 cmGlobalGenerator: Store targets in hash maps
d16ae636 cmMakefile: Use a hashmap for imported targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de52931c6844ae2a6c4317badafaec999fe636b
commit 5de52931c6844ae2a6c4317badafaec999fe636b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Apr 30 15:40:39 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Apr 30 15:40:39 2014 -0400
cmGlobalGenerator: Store targets in hash maps
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f09f7b3..4bdec3f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2070,15 +2070,13 @@ cmGlobalGenerator::FindTarget(const std::string name,
{
if (!excludeAliases)
{
-std::mapstd::string, cmTarget*::const_iterator ai
-= this-AliasTargets.find(name);
+TargetMap::const_iterator ai = this-AliasTargets.find(name);
if (ai != this-AliasTargets.end())
{
return ai-second;
}
}
- std::mapstd::string,cmTarget *::const_iterator i =
-this-TotalTargets.find ( name );
+ TargetMap::const_iterator i = this-TotalTargets.find ( name );
if ( i != this-TotalTargets.end() )
{
return i-second;
@@ -2859,7 +2857,7 @@ void cmGlobalGenerator::WriteSummary()
cmGeneratedFileStream fout(fname.c_str());
// Generate summary information files for each target.
- for(std::mapstd::string,cmTarget *::const_iterator ti =
+ for(TargetMap::const_iterator ti =
this-TotalTargets.begin(); ti != this-TotalTargets.end(); ++ti)
{
if ((ti-second)-GetType() == cmTarget::INTERFACE_LIBRARY)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 82fb1e5..14ec99a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -22,6 +22,10 @@
#include cmGeneratorTarget.h
#include cmGeneratorExpression.h
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+# include cmsys/hash_map.hxx
+#endif
+
class cmake;
class cmGeneratorTarget;
class cmGeneratorExpressionEvaluationFile;
@@ -389,9 +393,14 @@ protected:
cmTargetManifest TargetManifest;
// All targets in the entire project.
- std::mapstd::string,cmTarget * TotalTargets;
- std::mapstd::string,cmTarget * AliasTargets;
- std::mapstd::string,cmTarget * ImportedTargets;
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ typedef cmsys::hash_mapstd::string, cmTarget* TargetMap;
+#else
+ typedef std::mapstd::string,cmTarget * TargetMap;
+#endif
+ TargetMap TotalTargets;
+ TargetMap AliasTargets;
+ TargetMap ImportedTargets;
std::vectorcmGeneratorExpressionEvaluationFile* EvaluationFiles;
virtual const char* GetPredefinedTargetsFolder();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d16ae63650f047066b69966c7d1e502fe4f1601e
commit d16ae63650f047066b69966c7d1e502fe4f1601e
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Wed Apr 30 13:27:33 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Wed Apr 30 13:27:33 2014 -0400
cmMakefile: Use a hashmap for imported targets
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 07cfe12..ad2a555 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4134,7 +4134,7 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string
name,
{
// Look for an imported target. These take priority because they
// are more local in scope and do not have to be globally unique.
- std::mapstd::string, cmTarget*::const_iterator
+ ImportedTargetMap::const_iterator
imported = this-ImportedTargets.find(name);
if(imported != this-ImportedTargets.end())
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3bccb63..50d8e27 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -1010,7 +1010,12 @@ private:
friend class cmMakefileCall;
std::vectorcmTarget
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2735-ge346743
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 e34674373ee21903143098bbf200928799751c32 (commit)
via 63db5fcaf5a1beccc7cf661760227bd0b569 (commit)
from 978901a9d20659eafa2dadbd0023efbbc7b9c953 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e34674373ee21903143098bbf200928799751c32
commit e34674373ee21903143098bbf200928799751c32
Merge: 978901a 63db5fc
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:45:48 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 14:45:48 2014 -0400
Merge topic 'dev/hashmap-for-targets' into next
63db5fca cmMakefile: FIx up some missed hashmap conversions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63db5fcaf5a1beccc7cf661760227bd0b569
commit 63db5fcaf5a1beccc7cf661760227bd0b569
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:51:32 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 14:51:32 2014 -0400
cmMakefile: FIx up some missed hashmap conversions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index e80df84..e6672a8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -341,7 +341,7 @@ void cmGlobalVisualStudio8Generator::Generate()
if(this-AddCheckTarget())
{
// All targets depend on the build-system check target.
-for(std::mapstd::string,cmTarget *::const_iterator
+for(TargetMap::const_iterator
ti = this-TotalTargets.begin();
ti != this-TotalTargets.end(); ++ti)
{
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b3975b4..d44da37 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1219,7 +1219,7 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
void cmGlobalXCodeGenerator::ForceLinkerLanguages()
{
// This makes sure all targets link using the proper language.
- for(std::mapstd::string, cmTarget*::const_iterator
+ for(TargetMap::const_iterator
ti = this-TotalTargets.begin(); ti != this-TotalTargets.end(); ++ti)
{
this-ForceLinkerLanguage(*ti-second);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ad2a555..556bc9b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3911,8 +3911,7 @@ cmTarget* cmMakefile::FindTarget(const std::string name,
{
if (!excludeAliases)
{
-std::mapstd::string, cmTarget*::const_iterator i
- = this-AliasTargets.find(name);
+TargetMap::const_iterator i = this-AliasTargets.find(name);
if (i != this-AliasTargets.end())
{
return i-second;
@@ -4134,7 +4133,7 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string
name,
{
// Look for an imported target. These take priority because they
// are more local in scope and do not have to be globally unique.
- ImportedTargetMap::const_iterator
+ TargetMap::const_iterator
imported = this-ImportedTargets.find(name);
if(imported != this-ImportedTargets.end())
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 50d8e27..b4ee3b8 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -909,7 +909,12 @@ protected:
// libraries, classes, and executables
mutable cmTargets Targets;
- std::mapstd::string, cmTarget* AliasTargets;
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ typedef cmsys::hash_mapstd::string, cmTarget* TargetMap;
+#else
+ typedef std::mapstd::string, cmTarget* TargetMap;
+#endif
+ TargetMap AliasTargets;
cmGeneratorTargetsType GeneratorTargets;
std::vectorcmSourceFile* SourceFiles;
@@ -1010,12 +1015,7 @@ private:
friend class cmMakefileCall;
std::vectorcmTarget* ImportedTargetsOwned;
-#if defined(CMAKE_BUILD_WITH_CMAKE)
- typedef cmsys::hash_mapstd::string, cmTarget* ImportedTargetMap;
-#else
- typedef std::mapstd::string, cmTarget* ImportedTargetMap;
-#endif
- ImportedTargetMap ImportedTargets;
+ TargetMap ImportedTargets;
// Internal policy stack management.
void PushPolicy(bool weak = false,
---
Summary of changes:
Source/cmGlobalVisualStudio8Generator.cxx |2 +-
Source/cmGlobalXCodeGenerator.cxx |2 +-
Source/cmMakefile.cxx |5 ++---
Source/cmMakefile.h | 14 +++---
4 files changed, 11 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2737-g0035ef1
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 0035ef18b224c7f57efcf81e7185c62f8ad2bc9b (commit)
via 9f3d548e9643b9720316852db5cedf5946ee98c9 (commit)
from e34674373ee21903143098bbf200928799751c32 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0035ef18b224c7f57efcf81e7185c62f8ad2bc9b
commit 0035ef18b224c7f57efcf81e7185c62f8ad2bc9b
Merge: e346743 9f3d548
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:47:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 14:47:28 2014 -0400
Merge topic 'dev/refactor-source-depends-in-ninja' into next
9f3d548e LocalGenerator: Fix -Woverload-virtual warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f3d548e9643b9720316852db5cedf5946ee98c9
commit 9f3d548e9643b9720316852db5cedf5946ee98c9
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:53:12 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 14:53:12 2014 -0400
LocalGenerator: Fix -Woverload-virtual warning
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index d089aba..27a76cd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,6 +169,7 @@ public:
// append flags to a string
virtual void AppendFlags(std::string flags, const std::string newFlags);
+ using cmMakefile::AppendFlags;
// append an echo command
enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.h |1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2739-g0fa034f
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 0fa034f4df204a58bb4a6278308589ec29fe2cb0 (commit)
via 32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6 (commit)
from 0035ef18b224c7f57efcf81e7185c62f8ad2bc9b (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fa034f4df204a58bb4a6278308589ec29fe2cb0
commit 0fa034f4df204a58bb4a6278308589ec29fe2cb0
Merge: 0035ef1 32c8dc2
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 14:56:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 14:56:34 2014 -0400
Merge topic 'dev/refactor-source-depends-in-ninja' into next
32c8dc2f Fix 'using' statement
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6
commit 32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 15:02:23 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 15:02:23 2014 -0400
Fix 'using' statement
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index 27a76cd..0601245 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,7 +169,7 @@ public:
// append flags to a string
virtual void AppendFlags(std::string flags, const std::string newFlags);
- using cmMakefile::AppendFlags;
+ using cmLocalGenerator::AppendFlags;
// append an echo command
enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,
---
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2741-g5c4ee10
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 5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883 (commit)
via 6dd97aa153dabcf5948f6acf435733097e39feb4 (commit)
from 0fa034f4df204a58bb4a6278308589ec29fe2cb0 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883
commit 5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883
Merge: 0fa034f 6dd97aa
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 15:44:16 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 15:44:16 2014 -0400
Merge topic 'dev/faster-evis' into next
6dd97aa1 Windows: Avoid () in environment names
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dd97aa153dabcf5948f6acf435733097e39feb4
commit 6dd97aa153dabcf5948f6acf435733097e39feb4
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 15:44:43 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Fri May 2 15:44:43 2014 -0400
Windows: Avoid () in environment names
Use a redirection.
diff --git a/Modules/InstallRequiredSystemLibraries.cmake
b/Modules/InstallRequiredSystemLibraries.cmake
index 4b551e6..808e153 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -157,7 +157,8 @@ if(MSVC)
${msvc_install_dir}/../../VC/redist
${base_dir}/VC/redist
$ENV{ProgramFiles}/Microsoft Visual Studio ${v}.0/VC/redist
-$ENV{ProgramFiles(x86)}/Microsoft Visual Studio ${v}.0/VC/redist
+set(programfilesx86 ProgramFiles(x86))
+$ENV{${programfilesx86}}/Microsoft Visual Studio ${v}.0/VC/redist
)
mark_as_advanced(MSVC${v}_REDIST_DIR)
set(MSVC${v}_CRT_DIR
${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.CRT)
diff --git a/Modules/Platform/WindowsPaths.cmake
b/Modules/Platform/WindowsPaths.cmake
index 3240c23..658de3b 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -56,9 +56,10 @@ else()
if(DEFINED ENV{ProgramFiles})
list(APPEND CMAKE_SYSTEM_PREFIX_PATH $ENV{ProgramFiles})
endif()
- if(DEFINED ENV{ProgramFiles(x86)})
+ set(programfilesx86 ProgramFiles(x86))
+ if(DEFINED ENV{${programfilesx86}})
# 64-bit binary. 32-bit program files are in ProgramFiles(x86).
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH $ENV{ProgramFiles(x86)})
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH $ENV{${programfilesx86}})
elseif(DEFINED ENV{SystemDrive})
# Guess the 32-bit program files location.
if(EXISTS $ENV{SystemDrive}/Program Files (x86))
---
Summary of changes:
Modules/InstallRequiredSystemLibraries.cmake |3 ++-
Modules/Platform/WindowsPaths.cmake |5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2749-g3adf6d1
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 3adf6d196024e9bad3e4240a71be6c5b0532cc53 (commit)
via 77b3796581e0b82f0b977418ed52e8c25b96bbd7 (commit)
via 7b8a990424228716cc3161027dcf2c18ef9793b6 (commit)
via 10baf00f3d14124ee97ca12510595501d66ed70e (commit)
via 14e7a8ae1c8be09a58156d71b185e2b98d378a07 (commit)
via b4cb543e0c0648bbd3dbede91f864f89275417c4 (commit)
via e8e1f3a19fd07ba64381094b98c66f7d07c1746e (commit)
via 5554910ec2573282a85e61736e96f48e5f550066 (commit)
from 5c4ee10ca3ce2b76b1006bf4c6cef49f4238c883 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3adf6d196024e9bad3e4240a71be6c5b0532cc53
commit 3adf6d196024e9bad3e4240a71be6c5b0532cc53
Merge: 5c4ee10 77b3796
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri May 2 17:48:05 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 2 17:48:05 2014 -0400
Merge topic 'dev/source-file-performance' into next
77b37965 cmSourceFile: Take a string
7b8a9904 perf: Cache the language property string
10baf00f cmSourceFile: Cache the isUiFile check
14e7a8ae cmSourceFileLocation: Return a string reference
b4cb543e cmSourceFileLocation: Save some string copies
e8e1f3a1 cmSourceFileLocation: Simplify logic in Matches
5554910e cmSourceFileLocation: Avoid string allocation in extension checking
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77b3796581e0b82f0b977418ed52e8c25b96bbd7
commit 77b3796581e0b82f0b977418ed52e8c25b96bbd7
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Fri Mar 21 22:28:14 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Apr 28 21:43:40 2014 -0400
cmSourceFile: Take a string
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index bdcdbfd..f898260 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -86,7 +86,7 @@ public:
* Return the vector that holds the list of dependencies
*/
const std::vectorstd::string GetDepends() const {return this-Depends;}
- void AddDepend(const char* d) { this-Depends.push_back(d); }
+ void AddDepend(const std::string d) { this-Depends.push_back(d); }
// Get the properties
cmPropertyMap GetProperties() { return this-Properties; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b8a990424228716cc3161027dcf2c18ef9793b6
commit 7b8a990424228716cc3161027dcf2c18ef9793b6
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Tue Mar 11 00:22:02 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Apr 28 21:43:39 2014 -0400
perf: Cache the language property string
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 3b130ec..b833d3f 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -40,6 +40,8 @@ std::string const cmSourceFile::GetExtension() const
return this-Extension;
}
+const std::string cmSourceFile::propLANGUAGE = LANGUAGE;
+
//
void cmSourceFile::SetObjectLibrary(std::string const objlib)
{
@@ -56,7 +58,7 @@ std::string cmSourceFile::GetObjectLibrary() const
std::string cmSourceFile::GetLanguage()
{
// If the language was set explicitly by the user then use it.
- if(const char* lang = this-GetProperty(LANGUAGE))
+ if(const char* lang = this-GetProperty(propLANGUAGE))
{
return lang;
}
@@ -93,7 +95,7 @@ std::string cmSourceFile::GetLanguage()
std::string cmSourceFile::GetLanguage() const
{
// If the language was set explicitly by the user then use it.
- if(const char* lang = this-GetProperty(LANGUAGE))
+ if(const char* lang = this-GetProperty(propLANGUAGE))
{
return lang;
}
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index 42d6f8a..bdcdbfd 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -117,6 +117,8 @@ private:
void CheckLanguage(std::string const ext);
std::vectorstd::string Depends;
+
+ static const std::string propLANGUAGE;
};
// TODO: Factor out into platform information modules.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10baf00f3d14124ee97ca12510595501d66ed70e
commit 10baf00f3d14124ee97ca12510595501d66ed70e
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Sat Feb 8 21:35:52 2014 -0500
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Mon Apr 28 21:43:39 2014 -0400
cmSourceFile: Cache the isUiFile check
The filename extension call is expensive, so cache the .ui check.
diff --git a/Source/cmSourceFile.cxx b
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2680-gb085788
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 b085788ea4ac01b2bd53ccc65c60287295610b95 (commit)
via 0bcf3e9b5d2a4a156d39ca4092fd496309546239 (commit)
via 0561497410a1b07c256adf146bc2e86a7bf7b954 (commit)
via 040edebb9f1069f403f8c9bce6f81dbaaf589505 (commit)
via 4a74abcec4657ebd3349c1dfad3a8fbf6a9151fe (commit)
from 3402e60764e6dbb3626305a5a36a2d0ab4d1881d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b085788ea4ac01b2bd53ccc65c60287295610b95
commit b085788ea4ac01b2bd53ccc65c60287295610b95
Merge: 3402e60 0bcf3e9
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 1 13:49:21 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 1 13:49:21 2014 -0400
Merge topic 'dev/faster-evis' into next
0bcf3e9b tests: Add tests for spaces and tabs in variable names
05614974 EVIS: Output the variable-as-parsed in error message
040edebb CMP0053: Fix some weird wording
4a74abce Help: Update valid variable characters in cmake-language.7
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bcf3e9b5d2a4a156d39ca4092fd496309546239
commit 0bcf3e9b5d2a4a156d39ca4092fd496309546239
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 1 13:54:24 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 1 13:54:51 2014 -0400
tests: Add tests for spaces and tabs in variable names
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt
new file mode 100644
index 000..df67d37
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithEscapedSpaces.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake
new file mode 100644
index 000..805b2ca
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\ with\ escaped\ space})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake
new file mode 100644
index 000..58d8e8f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\ with\ escaped\ space})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt
new file mode 100644
index 000..059044f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithEscapedTabs.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake
new file mode 100644
index 000..214ab5d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\ with\ escaped\tab})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake
b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake
new file mode 100644
index 000..aa5123f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\with\ escaped\tab})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt
b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2683-g19dc6d0
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 19dc6d010dba3a135f71d61a9bfee562d1016868 (commit)
via d720a7cbb80e849f541f05e03fae8f060af2150c (commit)
via d5174e3b5ca94d14dd020024d347831b093f2a4b (commit)
from b085788ea4ac01b2bd53ccc65c60287295610b95 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19dc6d010dba3a135f71d61a9bfee562d1016868
commit 19dc6d010dba3a135f71d61a9bfee562d1016868
Merge: b085788 d720a7c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 1 14:43:03 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 1 14:43:03 2014 -0400
Merge topic 'dev/faster-evis' into next
d720a7cb Help: Add documentation on escaping changes with CMP0053
d5174e3b EVIS: Remove strings from the stack
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d720a7cbb80e849f541f05e03fae8f060af2150c
commit d720a7cbb80e849f541f05e03fae8f060af2150c
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 1 14:47:18 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 1 14:47:18 2014 -0400
Help: Add documentation on escaping changes with CMP0053
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index e8d2670..45f4bac 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -296,16 +296,15 @@ An *escape sequence* is a ``\`` followed by one character:
.. productionlist::
escape_sequence: `escape_identity` | `escape_encoded` | `escape_semicolon`
- escape_identity: '\(' | '\)' | '\#' | '\' | '\ ' |
-: '\\' | '\$' | '\@' | '\^'
+ escape_identity: '\' match '[^a-zA-Z]'
escape_encoded: '\t' | '\r' | '\n'
escape_semicolon: '\;'
-A ``\`` followed by one of ``()# \#@^`` simply encodes the literal
+A ``\`` followed by a non-alphanumeric character simply encodes the literal
character without interpreting it as syntax. A ``\t``, ``\r``, or ``\n``
-encodes a tab, carriage return, or newline character, respectively.
-A ``\;`` encodes itself but may be used in an `Unquoted Argument`_
-to encode the ``;`` without dividing the argument value on it.
+encodes a tab, carriage return, or newline character, respectively. A ``\;``
+encodes itself but may be used in an `Unquoted Argument`_ to encode the ``;``
+without dividing the argument value on it.
.. _`Variable References`:
diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst
index 542de63..9657368 100644
--- a/Help/policy/CMP0053.rst
+++ b/Help/policy/CMP0053.rst
@@ -28,6 +28,12 @@ cleaned up to simplify the behavior. Specifically:
* The setting of policy :policy:`CMP0010` is not considered,
so improper variable reference syntax is always an error.
+* More characters are allowed to be escaped in variable names.
+ Previously, only ``()# \#@^`` were valid characters to
+ escape. Now any non-alphanumeric, non-semicolon, non-NUL
+ character may be escaped following the ``escape_identity``
+ rule from :manual:`cmake-language`.
+
The ``OLD`` behavior for this policy is to honor the legacy behavior for
variable references and escape sequences. The ``NEW`` behavior is to
use the simpler variable expansion and escape sequence evaluation rules.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5174e3b5ca94d14dd020024d347831b093f2a4b
commit d5174e3b5ca94d14dd020024d347831b093f2a4b
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu May 1 14:34:06 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu May 1 14:34:06 2014 -0400
EVIS: Remove strings from the stack
Keep a single string around and build it up incrementally. This avoids
string allocation within the stack which is much faster.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cc52c24..481bb05 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2813,7 +2813,7 @@ typedef enum
struct t_lookup
{
t_domain domain;
- std::string lookup;
+ size_t loc;
};
cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
@@ -2834,6 +2834,8 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
const char* in = source.c_str();
const char* last = in;
+ std::string result;
+ result.reserve(source.size());
std::stackt_lookup openstack;
bool error = false;
bool done = false;
@@ -2850,8 +2852,8 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
{
t_lookup var = openstack.top();
openstack.pop();
- std::string lookup = var.lookup
