From c913bf5c820a1cbce76e0c1c305219870f4ca9e7 Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:10:29 +0300 Subject: [PATCH 1/2] Fix include path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36724ae..f46d640 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Export Include Directories #------------------------------------------------------------------------------------------- target_include_directories(EAThread PUBLIC include) - +target_include_directories(EAThread PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Package Dependencies #------------------------------------------------------------------------------------------- From c0161b5df8e56e217805151cff0dc4b0f5d5d4ca Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:36:16 +0300 Subject: [PATCH 2/2] Remove link to EABase --- CMakeLists.txt | 6 ------ test/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f46d640..8971b8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,6 @@ add_library(EAThread ${EATHREAD_SOURCES}) if(EATHREAD_BUILD_TESTS) add_subdirectory(test) -else() - add_subdirectory(test/packages/EABase) endif() #------------------------------------------------------------------------------------------- @@ -38,8 +36,4 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) #------------------------------------------------------------------------------------------- target_include_directories(EAThread PUBLIC include) target_include_directories(EAThread PRIVATE ../EABase/include/Common) -#------------------------------------------------------------------------------------------- -# Package Dependencies -#------------------------------------------------------------------------------------------- -target_link_libraries(EAThread EABase) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f0b86fd..485f04f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -51,7 +51,7 @@ add_subdirectory(packages/EAStdC) add_subdirectory(packages/EATest) target_link_libraries(EAThreadTest EAAssert) -target_link_libraries(EAThreadTest EABase) +) target_link_libraries(EAThreadTest EAMain) target_link_libraries(EAThreadTest EASTL) target_link_libraries(EAThreadTest EAStdC)