From 8d83f80e803c0ff8bdd44d05a73c2bc99244e858 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 27 Jul 2023 21:13:40 +0200
Subject: [PATCH 1/2] cmake: fix target include path for subdir projects
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9477a2c96..c5f764cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -664,12 +664,9 @@ set_target_properties(re-objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(re-objs PRIVATE ${RE_DEFINITIONS})
-target_include_directories(re-objs PRIVATE .)
+target_include_directories(re-objs PRIVATE include)
target_include_directories(re-objs PRIVATE
${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
-target_include_directories(re-objs PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- )
##############################################################################
@@ -698,6 +695,9 @@ if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
target_link_libraries(re PUBLIC ${LINKLIBS})
+ target_include_directories(re PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ )
add_library(libre::re ALIAS re)
if(MSVC)
From 269a416ec516c5f087102a92fc746ddb41bd5ab8 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 27 Jul 2023 21:24:41 +0200
Subject: [PATCH 2/2] test/cmake: remove include
---
test/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d93af11ab..e98c98ec7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -55,7 +55,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
endif()
include_directories(
- ../include
.
)