summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2020-04-25 00:19:25 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2020-04-25 00:19:25 -0400
commitca9c953d6a1ae654af48e91b393d1a1a52e3bd44 (patch)
tree3f8bcab42ae489e685a3fb8d1f1f3b1bae814218
parentbbfec30539b31a2b8faa0df79435db94cefee8fe (diff)
moved a few projects to requires_project()
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/CMakeLists.txt12
2 files changed, 3 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1e2088e..c34497a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.16)
project(organizer)
set(project_type exe)
set(executable_name ModOrganizer)
+set(enable_warnings OFF)
include(../cmake_common/project.cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 68060a0b..c43ebf10 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,18 +197,10 @@ add_filter(NAME src/widgets GROUPS
)
+requires_project(game_features githubpp bsatk esptk archive usvfs)
+
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
- ${modorganizer_super_path}/game_features/src
${modorganizer_super_path}/lootcli/include
- ${modorganizer_super_path}/githubpp/src
- ${modorganizer_super_path}/bsatk/src
- ${modorganizer_super_path}/archive/src
- ${modorganizer_super_path}/esptk/src
- ${modorganizer_build_path}/usvfs/include
-)
-
-target_link_libraries(${CMAKE_PROJECT_NAME}
- uibase usvfs_x64 bsatk esptk githubpp
)