Merge branch 'feature-binary-data-io' of https://github.com/AsPJT/PAX…

…_SAPIENTICA into feature-binary-data-io
AsPJT · Oct 31, 2023 · 367ae55 · 367ae55
2 parents ef79e93 + 72c2ad0
commit 367ae55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Project/IncludeTest/CMakeLists.txt b/Project/IncludeTest/CMakeLists.txt
@@ -3,7 +3,10 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Library)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Library
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary
+)
 
 file(GLOB_RECURSE LIB_HEADERS RELATIVE "${CMAKE_SOURCE_DIR}/../Library" "${CMAKE_SOURCE_DIR}/../Library/*.hpp")
 

diff --git a/Project/MapViewer/CMakeLists.txt b/Project/MapViewer/CMakeLists.txt
@@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Library
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary
 )
 
 find_package(SFML 2.5 COMPONENTS graphics)

diff --git a/Project/UnitTest/CMakeLists.txt b/Project/UnitTest/CMakeLists.txt
@@ -6,6 +6,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Library
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary
 )
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest ${CMAKE_BINARY_DIR}/googletest)
@@ -23,7 +24,7 @@ foreach(TEST_SOURCE ${TEST_SOURCES})
     add_executable(${TARGET_NAME} ${TEST_SOURCE})
     target_link_libraries(${TARGET_NAME} gtest_main)
     add_test(
-        NAME ${TARGET_NAME} 
+        NAME ${TARGET_NAME}
         COMMAND ${TARGET_NAME}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
     )