mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06: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

8
Source/cmExportBuildFileGenerator.cxx
View File

@@ -57,7 +57,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
this->LG->GetMakefile()->GetBacktrace());
return false;
}
if (te->GetType() == cmState::INTERFACE_LIBRARY) {
if (te->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
this->GenerateRequiredCMakeVersion(os, "3.0.0");
}
}
@@ -134,12 +134,12 @@ void cmExportBuildFileGenerator::GenerateImportTargetsConfig(
cmGeneratorTarget* target = *tei;
ImportPropertyMap properties;
if (target->GetType() != cmState::INTERFACE_LIBRARY) {
if (target->GetType() != cmStateEnums::INTERFACE_LIBRARY) {
this->SetImportLocationProperty(config, suffix, target, properties);
}
if (!properties.empty()) {
// Get the rest of the target details.
if (target->GetType() != cmState::INTERFACE_LIBRARY) {
if (target->GetType() != cmStateEnums::INTERFACE_LIBRARY) {
this->SetImportDetailProperties(config, suffix, target, properties,
missingTargets);
this->SetImportLinkInterface(config, suffix,
@@ -186,7 +186,7 @@ void cmExportBuildFileGenerator::SetImportLocationProperty(
// Add the import library for windows DLLs.
if (target->IsDLLPlatform() &&
(target->GetType() == cmState::SHARED_LIBRARY ||
(target->GetType() == cmStateEnums::SHARED_LIBRARY ||
target->IsExecutableWithExports()) &&
mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) {
std::string prop = "IMPORTED_IMPLIB";