From a4eb41b7fadb48363f0fffe40abc9b4c615cb6af Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:00:10 +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 a60892b..51f67f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ add_definitions(-D_CHAR16T) # Export Include Directories #------------------------------------------------------------------------------------------- target_include_directories(EAAssert PUBLIC include) +target_include_directories(EAAssert PRIVATE ../EABase/include/Common) #------------------------------------------------------------------------------------------- # Package Dependencies From 82c87712f1b91db814f33de1ee478190741baab5 Mon Sep 17 00:00:00 2001 From: Ofek Shilon Date: Thu, 7 May 2020 22:28:42 +0300 Subject: [PATCH 2/2] Remove link to EABase --- CMakeLists.txt | 4 ---- test/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51f67f6..f55652c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,4 @@ add_definitions(-D_CHAR16T) target_include_directories(EAAssert PUBLIC include) target_include_directories(EAAssert PRIVATE ../EABase/include/Common) -#------------------------------------------------------------------------------------------- -# Package Dependencies -#------------------------------------------------------------------------------------------- -target_link_libraries(EAAssert EABase) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9e9fb67..bca370e 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(EAAssertTest EABase) +) target_link_libraries(EAAssertTest EAMain) target_link_libraries(EAAssertTest EASTL) target_link_libraries(EAAssertTest EAStdC)