From 3c55ebe648ce2b530275d9ffb2b15e62786ff7db Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:08:13 +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 9bf3131..3e9615b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ add_definitions(-D_CHAR16T) # Include directories #------------------------------------------------------------------------------------------- target_include_directories(EAStdC PUBLIC include) +target_include_directories(EAStdC PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Dependencies From 1c1c7cd2cda567c14c0bdac9d03dbb8855de72bc Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:34:55 +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 3e9615b..62b1799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,6 @@ target_include_directories(EAStdC PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Dependencies #------------------------------------------------------------------------------------------- -target_link_libraries(EAStdC EABase) target_link_libraries(EAStdC EAAssert) target_link_libraries(EAStdC EAThread) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5300728..49a50ec 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -49,7 +49,7 @@ add_subdirectory(packages/EASTL) add_subdirectory(packages/EATest) add_subdirectory(packages/EAThread) -target_link_libraries(EAStdCTest EABase) +) target_link_libraries(EAStdCTest EAAssert) target_link_libraries(EAStdCTest EAMain) target_link_libraries(EAStdCTest EASTL)