build: Use target_include_directories instead of FILE_SET (#48)

y-scope · Jan 13, 2025 · 0bc88ce · 0bc88ce
1 parent b0c84be
commit 0bc88ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -18,7 +18,10 @@ concurrency:
 
 jobs:
   non-storage-unit-tests:
-    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        os: ["ubuntu-22.04", "ubuntu-24.04"]
+    runs-on: "${{matrix.os}}"
     steps:
       - uses: "actions/checkout@v4"
         with:

diff --git a/src/spider/CMakeLists.txt b/src/spider/CMakeLists.txt
@@ -32,14 +32,7 @@ set(SPIDER_CORE_HEADERS
 
 add_library(spider_core)
 target_sources(spider_core PRIVATE ${SPIDER_CORE_SOURCES})
-target_sources(
-    spider_core
-    PUBLIC
-        FILE_SET spider_core_headers
-        TYPE HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/..
-        FILES ${SPIDER_CORE_HEADERS}
-)
+target_sources(spider_core PUBLIC ${SPIDER_CORE_HEADERS})
 target_link_libraries(
     spider_core
     PUBLIC
@@ -157,14 +150,8 @@ set(SPIDER_CLIENT_SHARED_HEADERS
 
 add_library(spider_client)
 target_sources(spider_client PRIVATE ${SPIDER_CLIENT_SHARED_SOURCES})
-target_sources(
-    spider_client
-    PUBLIC
-        FILE_SET spider_client_shared_headers
-        TYPE HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/..
-        FILES ${SPIDER_CLIENT_SHARED_HEADERS}
-)
+target_sources(spider_client PUBLIC ${SPIDER_CLIENT_SHARED_HEADERS})
+target_include_directories(spider_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
 target_link_libraries(
     spider_client
     PUBLIC