summaryrefslogtreecommitdiffstats
path: root/Source/cmTargetPropertyComputer.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-20 12:51:04 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-20 12:51:04 (GMT)
commit92c3cab223845ca83533bba7b6d73f6180223935 (patch)
tree5a0897241d918b784598637e1efc0ba23dea3bda /Source/cmTargetPropertyComputer.h
parente10439121e9602f77f80531dd60acc781fba5e79 (diff)
parente6eecec761afd9c1b275d4adebfd08c2e96412fd (diff)
downloadCMake-92c3cab223845ca83533bba7b6d73f6180223935.zip
CMake-92c3cab223845ca83533bba7b6d73f6180223935.tar.gz
CMake-92c3cab223845ca83533bba7b6d73f6180223935.tar.bz2
Merge topic 'split-cmState'
e6eecec7 cmListFileCache: Remove cmState header include e3587ee0 cmTargetPropertyComputer: Add missing include e0a84904 cmState: Split auxiliary classes into separate files a91eaf38 cmState: Port dependents to new cmStateTypes header 27be1d81 cmState: Move extracted declarations to a separate file 34433c88 cmState: Remove compatibility typedefs cde6eb62 cmState: Port dependent code to new cmStateSnapshot name a9bf981a cmState: Move Snapshot type to separate namespace 17d27893 cmState: Port dependent code to new cmStateDirectory name 34bcec39 cmState: Move Directory class to separate namespace 2fe3e55d cmState: Move CacheEntryType enum to separate namespace a49751fb cmState: Move TargetType enum to separate namespace 0060391d cmState: Move SnapshotType enum to separate namespace 5bc964ed cmState: Move PositionType to separate namespace 2dc40996 cmState: Move PolicyStackEntry to separate namespace cb40af5d cmState: Move SnapshotDataType to separate namespace ...
Diffstat (limited to 'Source/cmTargetPropertyComputer.h')
-rw-r--r--Source/cmTargetPropertyComputer.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h
index ed9a4e2..352d858 100644
--- a/Source/cmTargetPropertyComputer.h
+++ b/Source/cmTargetPropertyComputer.h
@@ -5,6 +5,7 @@
#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmAlgorithms.h"
#include "cmListFileCache.h"
#include "cmSystemTools.h"
@@ -36,7 +37,7 @@ public:
static bool WhiteListedInterfaceProperty(const std::string& prop);
- static bool PassesWhitelist(cmState::TargetType tgtType,
+ static bool PassesWhitelist(cmStateEnums::TargetType tgtType,
std::string const& prop, cmMessenger* messenger,
cmListFileBacktrace const& context);
@@ -59,11 +60,11 @@ private:
{
// Watch for special "computed" properties that are dependent on
// other properties or variables. Always recompute them.
- if (tgt->GetType() == cmState::EXECUTABLE ||
- tgt->GetType() == cmState::STATIC_LIBRARY ||
- tgt->GetType() == cmState::SHARED_LIBRARY ||
- tgt->GetType() == cmState::MODULE_LIBRARY ||
- tgt->GetType() == cmState::UNKNOWN_LIBRARY) {
+ if (tgt->GetType() == cmStateEnums::EXECUTABLE ||
+ tgt->GetType() == cmStateEnums::STATIC_LIBRARY ||
+ tgt->GetType() == cmStateEnums::SHARED_LIBRARY ||
+ tgt->GetType() == cmStateEnums::MODULE_LIBRARY ||
+ tgt->GetType() == cmStateEnums::UNKNOWN_LIBRARY) {
static const std::string propLOCATION = "LOCATION";
if (prop == propLOCATION) {
if (!tgt->IsImported() &&