Merge pull request #19 from ModOrganizer2/update-cmake-common-qt6

Update following cmake_common changes.
ModOrganizer2 · Apr 28, 2022 · 9876f57 · 9876f57
2 parents c95039a + b371a5f
commit 9876f57
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 145 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,10 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(nxmhandler)
-set(project_type exe)
-set(enable_warnings OFF)
-
 if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
 else()
-	include(../cmake_common/project.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
 endif()
+
+project(nxmhandler)
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
-else()
-	include(../../cmake_common/src.cmake)
-endif()
-deploy_qt(BINARIES nxmhandler.exe NOPLUGINS)
+
+add_executable(nxmhandler)
+mo2_configure_executable(nxmhandler
+	WARNINGS OFF
+	PRIVATE_DEPENDS uibase)
+mo2_install_target(nxmhandler)
+
+mo2_deploy_qt(BINARIES nxmhandler.exe NOPLUGINS)
diff --git a/src/SConscript b/src/SConscript
diff --git a/src/nxmhandler.pro b/src/nxmhandler.pro
diff --git a/src/nxmhandler.qbs b/src/nxmhandler.qbs