fix: clear Unity INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
CI / macOS (push) Has been cancelled
CI / Windows / Clang (push) Has been cancelled
CI / macOS (push) Has been cancelled
CI / Windows / Clang (push) Has been cancelled
Unity sets INTERFACE_SYSTEM_INCLUDE_DIRECTORIES to a path inside the build tree, which CMake rejects on newer versions. Clear it after FetchContent; the path remains in INTERFACE_INCLUDE_DIRECTORIES.
This commit is contained in:
Vendored
+7
-5
@@ -36,6 +36,13 @@ FetchContent_Declare(
|
|||||||
|
|
||||||
FetchContent_MakeAvailable(unity)
|
FetchContent_MakeAvailable(unity)
|
||||||
|
|
||||||
|
# Unity sets INTERFACE_SYSTEM_INCLUDE_DIRECTORIES to a path inside the build
|
||||||
|
# tree, which CMake rejects on newer versions. The path stays in
|
||||||
|
# INTERFACE_INCLUDE_DIRECTORIES so headers are still found.
|
||||||
|
if (TARGET unity)
|
||||||
|
set_target_properties(unity PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "")
|
||||||
|
endif()
|
||||||
|
|
||||||
if (NOT TARGET Unity::Unity)
|
if (NOT TARGET Unity::Unity)
|
||||||
if (TARGET unity)
|
if (TARGET unity)
|
||||||
add_library(Unity::Unity ALIAS unity)
|
add_library(Unity::Unity ALIAS unity)
|
||||||
@@ -49,11 +56,6 @@ set(Unity_LIBRARIES Unity::Unity)
|
|||||||
set(Unity_VERSION "${UNITY_VERSION}")
|
set(Unity_VERSION "${UNITY_VERSION}")
|
||||||
set(Unity_INCLUDE_DIR "${unity_SOURCE_DIR}/src")
|
set(Unity_INCLUDE_DIR "${unity_SOURCE_DIR}/src")
|
||||||
|
|
||||||
if (Unity_INCLUDE_DIR AND TARGET unity)
|
|
||||||
set_target_properties(unity PROPERTIES
|
|
||||||
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Unity_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (TARGET unity)
|
if (TARGET unity)
|
||||||
target_compile_definitions(unity PUBLIC
|
target_compile_definitions(unity PUBLIC
|
||||||
|
|||||||
Reference in New Issue
Block a user