[Cmake-commits] CMake branch, master, updated. v3.9.1-549-g8a0ed37
Kitware Robot
kwrobot at kitware.com
Tue Aug 22 08:35:09 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 8a0ed37f617347a6c7c37c50a5321f05d678fa76 (commit)
via 6b37d69cdb815772983265a210400caa1cb615a8 (commit)
via 33cf8e415f0f59a8b2db22768e78bf94e8e66442 (commit)
via 02645aa6aec748a1f3ea24715b3bd03465ae4835 (commit)
via 3f17ccce1cc5b2c307aac866d9fd19aba73fd979 (commit)
via d0a20d290cc9d71c88a3906fe709e63c42983221 (commit)
via 52527468dc9e1e35617565f1736b6ee945c4a23b (commit)
from 86a5b97fe81308df64fe85ee899a5eb66c894afc (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=8a0ed37f617347a6c7c37c50a5321f05d678fa76
commit 8a0ed37f617347a6c7c37c50a5321f05d678fa76
Merge: 6b37d69 5252746
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 22 12:27:01 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Aug 22 08:27:04 2017 -0400
Merge topic 'ccg-no-mutable'
52527468 cmCustomCommandGenerator: Avoid mutable state
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1145
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b37d69cdb815772983265a210400caa1cb615a8
commit 6b37d69cdb815772983265a210400caa1cb615a8
Merge: 33cf8e4 d0a20d2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 22 12:26:40 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Aug 22 08:26:44 2017 -0400
Merge topic 'cmake-ice37-2'
d0a20d29 FindIce: Add support for separate Freeze NuGet package
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1152
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33cf8e415f0f59a8b2db22768e78bf94e8e66442
commit 33cf8e415f0f59a8b2db22768e78bf94e8e66442
Merge: 86a5b97 02645aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 22 08:25:32 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 22 08:25:32 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0a20d290cc9d71c88a3906fe709e63c42983221
commit d0a20d290cc9d71c88a3906fe709e63c42983221
Author: Roger Leigh <rleigh at codelibre.net>
AuthorDate: Thu Aug 17 20:41:18 2017 +0100
Commit: Roger Leigh <rleigh at codelibre.net>
CommitDate: Thu Aug 17 20:59:09 2017 +0100
FindIce: Add support for separate Freeze NuGet package
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index a8133da..b37f796 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -304,6 +304,7 @@ function(_Ice_FIND)
foreach(ice_version ${ice_versions})
foreach(vcver IN LISTS vcvers)
list(APPEND ice_nuget_dirs "zeroc.ice.v${vcver}.${ice_version}")
+ list(APPEND freeze_nuget_dirs "zeroc.freeze.v${vcver}.${ice_version}")
endforeach()
endforeach()
find_path(Ice_NUGET_DIR
@@ -313,6 +314,13 @@ function(_Ice_FIND)
if(Ice_NUGET_DIR)
list(APPEND ice_roots "${Ice_NUGET_DIR}")
endif()
+ find_path(Freeze_NUGET_DIR
+ NAMES "tools/slice2freeze.exe"
+ PATH_SUFFIXES ${freeze_nuget_dirs}
+ DOC "Freeze NuGet directory")
+ if(Freeze_NUGET_DIR)
+ list(APPEND ice_roots "${Freeze_NUGET_DIR}")
+ endif()
foreach(ice_version ${ice_versions})
# Ice 3.3 releases use a Visual Studio year suffix and value is
# enclosed in double quotes, though only the leading quote is
@@ -390,6 +398,13 @@ function(_Ice_FIND)
DOC "Ice include directory")
set(Ice_INCLUDE_DIR "${Ice_INCLUDE_DIR}" PARENT_SCOPE)
+ find_path(Freeze_INCLUDE_DIR
+ NAMES "Freeze/Freeze.h"
+ HINTS ${ice_roots}
+ PATH_SUFFIXES ${ice_include_suffixes}
+ DOC "Freeze include directory")
+ set(Freeze_INCLUDE_DIR "${Freeze_INCLUDE_DIR}" PARENT_SCOPE)
+
# In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer
# version-specific dir
list(APPEND ice_slice_paths
@@ -527,6 +542,9 @@ unset(_Ice_REQUIRED_LIBS_FOUND)
if(Ice_FOUND)
set(Ice_INCLUDE_DIRS "${Ice_INCLUDE_DIR}")
+ if (Freeze_INCLUDE_DIR)
+ list(APPEND Ice_INCLUDE_DIRS "${Freeze_INCLUDE_DIR}")
+ endif()
set(Ice_SLICE_DIRS "${Ice_SLICE_DIR}")
set(Ice_LIBRARIES "${Ice_LIBRARY}")
foreach(_Ice_component ${Ice_FIND_COMPONENTS})
@@ -541,10 +559,8 @@ if(Ice_FOUND)
set("${_Ice_component_lib}" "${${_Ice_component_cache}}")
if(NOT TARGET ${_Ice_imported_target})
add_library(${_Ice_imported_target} UNKNOWN IMPORTED)
- if()
- set_target_properties(${_Ice_imported_target} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Ice_INCLUDE_DIR}")
- endif()
+ set_target_properties(${_Ice_imported_target} PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${Ice_INCLUDE_DIRS}")
if(EXISTS "${${_Ice_component_cache}}")
set_target_properties(${_Ice_imported_target} PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
@@ -581,6 +597,8 @@ if(Ice_DEBUG)
message(STATUS "Ice_INCLUDE_DIR directory: ${Ice_INCLUDE_DIR}")
message(STATUS "Ice_SLICE_DIR directory: ${Ice_SLICE_DIR}")
message(STATUS "Ice_LIBRARIES: ${Ice_LIBRARIES}")
+ message(STATUS "Freeze_INCLUDE_DIR directory: ${Freeze_INCLUDE_DIR}")
+ message(STATUS "Ice_INCLUDE_DIRS directory: ${Ice_INCLUDE_DIRS}")
foreach(program ${_Ice_db_programs} ${_Ice_programs} ${_Ice_slice_programs})
string(TOUPPER "${program}" program_upcase)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52527468dc9e1e35617565f1736b6ee945c4a23b
commit 52527468dc9e1e35617565f1736b6ee945c4a23b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 8 14:46:48 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 8 14:59:11 2017 -0400
cmCustomCommandGenerator: Avoid mutable state
Expand generator expressions of DEPENDS in the constructor instead
of on-demand.
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 67213ec..ef46b17 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -24,7 +24,6 @@ cmCustomCommandGenerator::cmCustomCommandGenerator(cmCustomCommand const& cc,
, OldStyle(cc.GetEscapeOldStyle())
, MakeVars(cc.GetEscapeAllowMakeVars())
, GE(new cmGeneratorExpression(cc.GetBacktrace()))
- , DependsDone(false)
{
const cmCustomCommandLines& cmdlines = this->CC.GetCommandLines();
for (cmCustomCommandLines::const_iterator cmdline = cmdlines.begin();
@@ -44,6 +43,22 @@ cmCustomCommandGenerator::cmCustomCommandGenerator(cmCustomCommand const& cc,
}
this->CommandLines.push_back(argv);
}
+
+ std::vector<std::string> depends = this->CC.GetDepends();
+ for (std::vector<std::string>::const_iterator i = depends.begin();
+ i != depends.end(); ++i) {
+ CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = this->GE->Parse(*i);
+ std::vector<std::string> result;
+ cmSystemTools::ExpandListArgument(cge->Evaluate(this->LG, this->Config),
+ result);
+ for (std::vector<std::string>::iterator it = result.begin();
+ it != result.end(); ++it) {
+ if (cmSystemTools::FileIsFullPath(it->c_str())) {
+ *it = cmSystemTools::CollapseFullPath(*it);
+ }
+ }
+ this->Depends.insert(this->Depends.end(), result.begin(), result.end());
+ }
}
cmCustomCommandGenerator::~cmCustomCommandGenerator()
@@ -171,23 +186,5 @@ std::vector<std::string> const& cmCustomCommandGenerator::GetByproducts() const
std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const
{
- if (!this->DependsDone) {
- this->DependsDone = true;
- std::vector<std::string> depends = this->CC.GetDepends();
- for (std::vector<std::string>::const_iterator i = depends.begin();
- i != depends.end(); ++i) {
- CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = this->GE->Parse(*i);
- std::vector<std::string> result;
- cmSystemTools::ExpandListArgument(cge->Evaluate(this->LG, this->Config),
- result);
- for (std::vector<std::string>::iterator it = result.begin();
- it != result.end(); ++it) {
- if (cmSystemTools::FileIsFullPath(it->c_str())) {
- *it = cmSystemTools::CollapseFullPath(*it);
- }
- }
- this->Depends.insert(this->Depends.end(), result.begin(), result.end());
- }
- }
return this->Depends;
}
diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h
index 0a2adb5..ea33b51 100644
--- a/Source/cmCustomCommandGenerator.h
+++ b/Source/cmCustomCommandGenerator.h
@@ -21,9 +21,8 @@ class cmCustomCommandGenerator
bool OldStyle;
bool MakeVars;
cmGeneratorExpression* GE;
- mutable bool DependsDone;
- mutable std::vector<std::string> Depends;
cmCustomCommandLines CommandLines;
+ std::vector<std::string> Depends;
const char* GetCrossCompilingEmulator(unsigned int c) const;
const char* GetArgv0Location(unsigned int c) const;
-----------------------------------------------------------------------
Summary of changes:
Modules/FindIce.cmake | 26 ++++++++++++++++++++++----
Source/cmCustomCommandGenerator.cxx | 35 ++++++++++++++++-------------------
Source/cmCustomCommandGenerator.h | 3 +--
3 files changed, 39 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list