diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2022-07-14 13:54:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-14 13:54:46 (GMT) |
| commit | b051fa5392e20e5e50ae662c840ac0ff8af5b22e (patch) | |
| tree | 1f4eeb9cf9cf3230acf25c752bb3a43c014a1df2 | |
| parent | 7fa5b3eecc60d2a4e66eb7eeff019fd2f1a7d397 (diff) | |
| parent | d99d33d7493daa721e96de85240371bf84b9c62b (diff) | |
| download | CMake-b051fa5392e20e5e50ae662c840ac0ff8af5b22e.zip CMake-b051fa5392e20e5e50ae662c840ac0ff8af5b22e.tar.gz CMake-b051fa5392e20e5e50ae662c840ac0ff8af5b22e.tar.bz2 | |
Merge topic 'vs-msb-8028'
d99d33d749 VS: Generate IntDir property for INTERFACE libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7462
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/InterfaceLibSources-check.cmake | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index a7460e8..2356869 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2930,7 +2930,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions( Elem& e0) { cmStateEnums::TargetType ttype = this->GeneratorTarget->GetType(); - if (ttype > cmStateEnums::GLOBAL_TARGET) { + if (ttype > cmStateEnums::INTERFACE_LIBRARY) { return; } if (this->ProjectType == VsProjectType::csproj) { diff --git a/Tests/RunCMake/VS10Project/InterfaceLibSources-check.cmake b/Tests/RunCMake/VS10Project/InterfaceLibSources-check.cmake index bcdc101..1701a36 100644 --- a/Tests/RunCMake/VS10Project/InterfaceLibSources-check.cmake +++ b/Tests/RunCMake/VS10Project/InterfaceLibSources-check.cmake @@ -5,6 +5,7 @@ if(NOT EXISTS "${vcProjectFile}") endif() set(found_iface_h 0) +set(found_int_dir 0) file(STRINGS "${vcProjectFile}" lines) foreach(line IN LISTS lines) if(line MATCHES "<([A-Za-z0-9_]+) +Include=.*iface\\.h") @@ -19,7 +20,15 @@ foreach(line IN LISTS lines) endif() set(found_iface_h 1) endif() + if(line MATCHES "^ *<IntDir [^<>]+>[^<>]+</IntDir>") + set(found_int_dir 1) + endif() endforeach() if(NOT found_iface_h) set(RunCMake_TEST_FAILED "iface.h not referenced in\n ${vcProjectFile}") + return() +endif() +if(NOT found_int_dir) + set(RunCMake_TEST_FAILED "No references to IntDir in\n ${vcProjectFile}") + return() endif() |