mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 20:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Browse Source 
Since commit 4391913133 (Add INTERFACE libraries to generated
buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1), the
VS generator may process INTERFACE libraries.  Avoid code paths in the
generator that process include directories because they should not be
used by INTERFACE libraries since they do not compile anything.

Fixes: #22494
This commit is contained in:
Brad King
2021-07-29 11:21:13 -04:00
parent 516ac348c7
commit 53aabe9817
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -4093,6 +4093,9 @@ void cmVisualStudio10TargetGenerator::WriteMidlOptions(
if (this->ProjectType == csproj) {
return;
}
if (this->GeneratorTarget->GetType() > cmStateEnums::UTILITY) {
return;
}
// This processes *any* of the .idl files specified in the project's file
// list (and passed as the item metadata %(Filename) expressing the rule

7
Tests/RunCMake/InterfaceLibrary/IncludeDirectories.cmake Normal file
View File

@@ -0,0 +1,7 @@
cmake_policy(SET CMP0076 NEW)
include_directories(Inc1 Inc2)
add_library(iface INTERFACE)
target_sources(iface PRIVATE iface.c)
# Ensure the INCLUDE_DIRECTORIES property is populated.
# Since interface libraries do not actually compile anything, this should be ignored.
set_property(TARGET iface APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/Inc3 ${CMAKE_CURRENT_SOURCE_DIR}/Inc4)

1
Tests/RunCMake/InterfaceLibrary/RunCMakeTest.cmake
View File

@@ -34,3 +34,4 @@ run_WithSources(ConfigSources "build1:iface")
run_WithSources(EmptySources "build1:iface" "build2:iface2,merge")
run_WithSources(ExcludeFromAll "build1" "build2:iface" "build3:iface2,merge")
run_WithSources(PublicSources "build1" "build2:iface" "build3:iface2,merge")
run_WithSources(IncludeDirectories "build1:iface")