From 5afbeee042428ca623f92855f3ad411665f42238 Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:07:06 +0300 Subject: [PATCH 1/2] Fix include path --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 982b23d..17cfbae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ add_definitions(-DEAMAIN_NETWORK_CHANNEL_PORT=8080) #------------------------------------------------------------------------------------------- target_include_directories(EAMain PUBLIC include) target_include_directories(EAMain PUBLIC source) +target_include_directories(EAMain PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Package Dependencies From 9b9f15681232fd70be46b70af379bc4c63277c15 Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:34:17 +0300 Subject: [PATCH 2/2] Remove link to EABase --- CMakeLists.txt | 1 - test/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17cfbae..bbf4d8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,6 @@ target_include_directories(EAMain PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Package Dependencies #------------------------------------------------------------------------------------------- -target_link_libraries(EAMain EABase) target_link_libraries(EAMain EAAssert) target_link_libraries(EAMain EAStdC) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8b2293a..278ca31 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,7 +43,7 @@ add_subdirectory(packages/EAStdC) add_subdirectory(packages/EATest) add_subdirectory(packages/EAThread) -target_link_libraries(EAMainTest EABase) +) target_link_libraries(EAMainTest EAAssert) target_link_libraries(EAMainTest EAMain) target_link_libraries(EAMainTest EASTL)