mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 01:28:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmState: Move TargetType enum to separate namespace

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-18 21:28:46 +02:00
parent 0060391dff
commit a49751fb2e
72 changed files with 855 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmTargetPropertyComputer.h
+6 -6
View File
@@ -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() &&