summaryrefslogtreecommitdiffstats
path: root/Source/cmTargetPropertyComputer.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-18 19:28:46 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-19 13:40:58 (GMT)
commita49751fb2eed0ca6415b243c35b23201b8060597 (patch)
treea96a9932ebefd4fb254ac2c769bee78fc6aefdb9 /Source/cmTargetPropertyComputer.h
parent0060391dffe824526b1f359db79c66c55e53d0c5 (diff)
downloadCMake-a49751fb2eed0ca6415b243c35b23201b8060597.zip
CMake-a49751fb2eed0ca6415b243c35b23201b8060597.tar.gz
CMake-a49751fb2eed0ca6415b243c35b23201b8060597.tar.bz2
cmState: Move TargetType enum to separate namespace
Diffstat (limited to 'Source/cmTargetPropertyComputer.h')
-rw-r--r--Source/cmTargetPropertyComputer.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h
index ed9a4e2..f8b683a 100644
--- a/Source/cmTargetPropertyComputer.h
+++ b/Source/cmTargetPropertyComputer.h
@@ -36,7 +36,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 +59,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() &&