From e3fda08d5217699b748b39b36784f4c5747df070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20J=C3=A4mtner?= <hanja189@student.liu.se>
Date: Mon, 13 Jul 2020 19:37:34 +0200
Subject: [PATCH] Refactor submodules
---
.gitmodules | 4 ++--
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 725cac4d5..955c3aa4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
[submodule "lib/pybind11"]
path = lib/pybind11
url = https://github.com/pybind/pybind11
-[submodule "lib/s2client-api"]
- path = lib/s2client-api
+[submodule "lib/cpp-sc2"]
+ path = lib/cpp-sc2
url = https://github.com/Jackyline/cpp-sc2.git
[submodule "lib/sc2-gamedata"]
path = lib/sc2-gamedata
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f92edcefc..6a79da24e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(BUILD_API_EXAMPLES OFF CACHE INTERNAL "" FORCE)
set(BUILD_API_TESTS OFF CACHE INTERNAL "" FORCE)
add_subdirectory(lib/pybind11)
-add_subdirectory(lib/s2client-api)
+add_subdirectory(lib/cpp-sc2)
add_subdirectory(src)
add_subdirectory(python-api-src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c540390a..31e2f6846 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,13 +2,13 @@
file(GLOB BOT_SOURCES "*.cpp" "*.h" "*.hpp")
include_directories(SYSTEM
- ${PROJECT_SOURCE_DIR}/lib/s2client-api/include
- ${PROJECT_SOURCE_DIR}/lib/s2client-api/contrib/protobuf/src
- ${PROJECT_BINARY_DIR}/lib/s2client-api/generated
+ ${PROJECT_SOURCE_DIR}/lib/cpp-sc2/include
+ ${PROJECT_SOURCE_DIR}/lib/cpp-sc2/contrib/protobuf/src
+ ${PROJECT_BINARY_DIR}/lib/cpp-sc2/generated
${PROJECT_SOURCE_DIR}/lib/json/include
)
-link_directories(${PROJECT_BINARY_DIR}/s2client-api/bin)
+link_directories(${PROJECT_BINARY_DIR}/cpp-sc2/bin)
# Enable compilation of the SC2 version of the bot.
add_definitions(-DSC2API)
--
GitLab