From bbfec30539b31a2b8faa0df79435db94cefee8fe Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 23 Apr 2020 21:00:00 -0400
Subject: now using new common cmakefiles fixed includes because shared/ isn't
 in the path anymore removed unused modeltest files

---
 CMakeLists.txt | 42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac9d8fc7..e1e2088e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,39 +1,13 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16)
 
-ADD_COMPILE_OPTIONS(
-	$<$<CXX_COMPILER_ID:MSVC>:/MP>
-	$<$<CXX_COMPILER_ID:MSVC>:/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING>
-	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>>
-	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+project(organizer)
+set(project_type exe)
+set(executable_name ModOrganizer)
 
-PROJECT(organizer)
+include(../cmake_common/project.cmake)
 
-# sets ModOrganizer as StartUp Project in Visual Studio
-set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT "ModOrganizer")
+set(additional_translations ${uibase_path}/src)
 
-set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
-set(CMAKE_INSTALL_MESSAGE NEVER)
+add_subdirectory(src)
 
-SET(DEPENDENCIES_DIR CACHE PATH "")
-
-# hint to find qt in dependencies path
-LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
-LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)
-LIST(APPEND CMAKE_PREFIX_PATH ${FMT_ROOT}/build)
-
-ADD_SUBDIRECTORY(src)
-
-set(vcxproj_user_file "${CMAKE_CURRENT_BINARY_DIR}/INSTALL.vcxproj.user")
-if(NOT EXISTS ${vcxproj_user_file})
-	FILE(WRITE ${vcxproj_user_file}
-		"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-			"<Project ToolsVersion=\"Current\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
-			  "<PropertyGroup>\n"
-				"<LocalDebuggerWorkingDirectory>${CMAKE_INSTALL_PREFIX}/bin</LocalDebuggerWorkingDirectory>\n"
-				"<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>"
-				"<LocalDebuggerCommand>${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe</LocalDebuggerCommand>\n"
-			  "</PropertyGroup>\n"
-			"</Project>\n")
-endif()
-
-INSTALL(FILES dump_running_process.bat DESTINATION bin)
+install(FILES dump_running_process.bat DESTINATION bin)
-- 
cgit v1.3.1


From ca9c953d6a1ae654af48e91b393d1a1a52e3bd44 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 25 Apr 2020 00:19:25 -0400
Subject: moved a few projects to requires_project()

---
 CMakeLists.txt     |  1 +
 src/CMakeLists.txt | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'CMakeLists.txt')

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
 )
 
 
-- 
cgit v1.3.1