Skip to content

Fix CMake build on Ubuntu #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OfekShilon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix CMake build on Ubuntu #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c913bf5
Fix include path
OfekShilon May 7, 2020
c0161b5
Remove link to EABase
OfekShilon May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ add_library(EAThread ${EATHREAD_SOURCES})

if(EATHREAD_BUILD_TESTS)
add_subdirectory(test)
else()
add_subdirectory(test/packages/EABase)
endif()

#-------------------------------------------------------------------------------------------
Expand All @@ -37,9 +35,5 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
# Export Include Directories
#-------------------------------------------------------------------------------------------
target_include_directories(EAThread PUBLIC include)

#-------------------------------------------------------------------------------------------
# Package Dependencies
#-------------------------------------------------------------------------------------------
target_link_libraries(EAThread EABase)
target_include_directories(EAThread PRIVATE ../EABase/include/Common)

2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down