From e9ff935840b73cde449f852630c23641a1ffc08a Mon Sep 17 00:00:00 2001 From: fallenoak Date: Wed, 2 Dec 2020 20:32:58 -0600 Subject: [PATCH] chore(build): migrate to system lib --- .gitmodules | 3 +++ CMakeLists.txt | 19 +------------------ lib/system | 1 + test/CMakeLists.txt | 4 ++-- 4 files changed, 7 insertions(+), 20 deletions(-) create mode 160000 lib/system diff --git a/.gitmodules b/.gitmodules index 712e832..5fcda73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vendor/squall"] path = lib/squall url = https://github.com/whoahq/squall +[submodule "lib/system"] + path = lib/system + url = https://github.com/whoahq/system diff --git a/CMakeLists.txt b/CMakeLists.txt index fbe4606..f4f7f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,24 +18,7 @@ project(tempest) set(CMAKE_CXX_STANDARD 11) -# Arch defines -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(WHOA_ARCH_64 1) -elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(WHOA_ARCH_32 1) -endif() - -# OS defines -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(WHOA_PLATFORM_WIN 1) - add_definitions(-DWHOA_PLATFORM_WIN) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(WHOA_PLATFORM_LINUX 1) - add_definitions(-DWHOA_PLATFORM_LINUX) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(WHOA_PLATFORM_MAC 1) - add_definitions(-DWHOA_PLATFORM_MAC) -endif() +include(lib/system/cmake/system.cmake) add_subdirectory(lib) add_subdirectory(tempest) diff --git a/lib/system b/lib/system new file mode 160000 index 0000000..f886ab5 --- /dev/null +++ b/lib/system @@ -0,0 +1 @@ +Subproject commit f886ab5bc35b2e0d968baa8dec3faaccf385fbc3 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9b3ed8e..f8b7b18 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE TEST_SOURCES "*.cpp") -if(WHOA_PLATFORM_MAC) +if(WHOA_SYSTEM_MAC) set_source_files_properties(${TEST_SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++" ) @@ -14,7 +14,7 @@ if(WHOA_PLATFORM_MAC) ) endif() -if(WHOA_PLATFORM_LINUX OR WHOA_PLATFORM_WIN) +if(WHOA_SYSTEM_LINUX OR WHOA_SYSTEM_WIN) add_executable(TempestTest ${TEST_SOURCES}) target_link_libraries(TempestTest