[Cmake-commits] CMake branch, master, updated. v3.4.0-rc2-434-g2fd5fd1
Brad King
brad.king at kitware.com
Wed Oct 28 08:48:10 EDT 2015
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 2fd5fd1f4d93322e85d662c1467a46cd7da84560 (commit)
via 13a37f5f76eb03e01e9ca225281531233ff0006c (commit)
via 958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit)
via 91a829c165209b96c20d17f8eb7d46d3375cc57c (commit)
via e0213882222798eec587a4dbed6f28555d64b8d9 (commit)
via 0554c2c970bf12dba01b408f3d8a103ede10a30b (commit)
via b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit)
via ce43ed2cc14f96c56441da9908053737efbaaf2e (commit)
via d90c9738da7003b966036c70727611b17d17f3a6 (commit)
via 331023ae06b795a1733ae03dce2ce2197ca1c36a (commit)
via a03f3d0e01edcb617813144626400058a5c0a177 (commit)
via d50c4220e29ef0b7366f3e1812f0a79736f2c18e (commit)
via 803f1901784937e40717fbf6cc675eb7aacbcce1 (commit)
from 1e8c920d0409770214a4ff517f6a4c31b9830f45 (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=2fd5fd1f4d93322e85d662c1467a46cd7da84560
commit 2fd5fd1f4d93322e85d662c1467a46cd7da84560
Merge: 1e8c920 13a37f5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:08 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:48:08 2015 -0400
Merge topic 'minor-cleanups'
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
d90c9738 Makefiles: Remove some unneeded casts
331023ae Export: Remove unused variable
a03f3d0e cmFunctionBlocker: Constify method
d50c4220 Xcode: Fix typo in comment
803f1901 Xcode: Remove trailing semicolon
diff --cc Source/cmTarget.cxx
index 1eebd12,da49048..9ea1a34
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -61,9 -61,7 +61,8 @@@ cmTarget::cmTarget(
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsAndroid = false;
- this->IsApple = false;
this->IsImportedTarget = false;
+ this->ImportedGloballyVisible = false;
this->BuildInterfaceIncludesAppended = false;
}
diff --cc Source/cmTarget.h
index 62e10f4,f3a45d3..97b0871
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -349,9 -357,7 +348,8 @@@ private
bool RecordDependencies;
bool DLLPlatform;
bool IsAndroid;
- bool IsApple;
bool IsImportedTarget;
+ bool ImportedGloballyVisible;
bool BuildInterfaceIncludesAppended;
#if defined(_WIN32) && !defined(__CYGWIN__)
bool LinkLibrariesForVS6Analyzed;
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkDepends.h | 1 -
Source/cmExportBuildFileGenerator.cxx | 1 -
Source/cmExtraKateGenerator.cxx | 1 -
Source/cmExtraKateGenerator.h | 2 --
Source/cmFunctionBlocker.h | 2 +-
Source/cmGeneratorExpressionDAGChecker.cxx | 1 -
Source/cmGeneratorExpressionEvaluator.h | 6 ++----
Source/cmGeneratorExpressionNode.cxx | 1 +
Source/cmGeneratorExpressionNode.h | 2 --
Source/cmGeneratorExpressionParser.h | 2 --
Source/cmGlobalUnixMakefileGenerator3.cxx | 6 ++----
Source/cmGlobalUnixMakefileGenerator3.h | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
Source/cmInstallDirectoryGenerator.cxx | 1 -
Source/cmLocalNinjaGenerator.cxx | 2 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 21 ++++++++++-----------
Source/cmLocalVisualStudio10Generator.cxx | 1 -
Source/cmMakefile.cxx | 4 ++--
Source/cmTarget.cxx | 7 ++-----
Source/cmTarget.h | 2 --
Source/cmTestGenerator.cxx | 2 --
Source/cmXCodeObject.h | 4 ++--
22 files changed, 25 insertions(+), 48 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list