From 717557b18c98555e3e048ab87c3896fa6c8d6c6b Mon Sep 17 00:00:00 2001 From: fallenoak Date: Wed, 2 Dec 2020 20:25:10 -0600 Subject: [PATCH] chore(build): migrate squall to lib --- .gitmodules | 2 +- CMakeLists.txt | 1 + lib/CMakeLists.txt | 1 + {vendor => lib}/squall | 0 vendor/CMakeLists.txt | 1 - 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 lib/CMakeLists.txt rename {vendor => lib}/squall (100%) diff --git a/.gitmodules b/.gitmodules index 12ae86d..712e832 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "vendor/squall"] - path = vendor/squall + path = lib/squall url = https://github.com/whoahq/squall diff --git a/CMakeLists.txt b/CMakeLists.txt index 9298deb..fbe4606 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-DWHOA_PLATFORM_MAC) endif() +add_subdirectory(lib) add_subdirectory(tempest) add_subdirectory(test) add_subdirectory(vendor) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 0000000..d8c19f2 --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(squall) diff --git a/vendor/squall b/lib/squall similarity index 100% rename from vendor/squall rename to lib/squall diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index d8c19f2..e69de29 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -1 +0,0 @@ -add_subdirectory(squall)