Refactor CMake stuff after mo2-cmake updates for sources management.

ModOrganizer2 · Jul 14, 2024 · 5b12135 · 5b12135
1 parent 58aeab6
commit 5b12135
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 64 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,46 +4,7 @@ find_package(Qt6 CONFIG REQUIRED COMPONENTS Network Qml Quick QuickWidgets Widge
 find_package(spdlog CONFIG REQUIRED)
 find_package(Boost REQUIRED CONFIG COMPONENTS thread)
 
-file(GLOB_RECURSE uibase_headers RELATIVE ${CMAKE_CURRENT_LIST_DIR} "${CMAKE_CURRENT_LIST_DIR}/../include/**/*.h")
-
-add_library(uibase SHARED)
-mo2_configure_target(uibase WARNINGS ON EXTERNAL_WARNINGS ON)
-target_sources(uibase
-	PUBLIC
-		FILE_SET HEADERS
-		BASE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../include
-		FILES ${uibase_headers}
-)
-
-set_target_properties(uibase PROPERTIES DEBUG_POSTFIX d)
-
-# TODO: remove this after fixing UIBase #include<> directives
-target_include_directories(uibase PRIVATE
-	$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/uibase>
-	$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/uibase/game_features>
-)
-
-add_library(mo2::uibase ALIAS uibase)
-
-target_compile_definitions(uibase PRIVATE -DUIBASE_EXPORT SPDLOG_USE_STD_FORMAT)
-
-target_link_libraries(uibase
-	PUBLIC Qt6::Widgets Qt6::Network Qt6::QuickWidgets
-	PRIVATE
-		Boost::headers Boost::thread spdlog::spdlog_header_only
-		Qt6::Qml Qt6::Quick Version)
-
-# installation
-install(TARGETS uibase EXPORT uibaseTargets FILE_SET HEADERS)
-install(FILES $<TARGET_PDB_FILE:uibase> DESTINATION pdb)
-install(EXPORT uibaseTargets
-	FILE mo2-uibase-targets.cmake
-	NAMESPACE mo2::
-	DESTINATION lib/cmake/mo2-uibase
-)
-
-# filters
-source_group(src FILES
+set(root_headers
 	../include/uibase/delayedfilewriter.h
 	../include/uibase/diagnosisreport.h
 	../include/uibase/dllimport.h
@@ -71,15 +32,13 @@ source_group(src FILES
 	../include/uibase/utility.h
 	../include/uibase/versioninfo.h
 )
-
-source_group(src/interfaces FILES
+set(interface_headers
 	../include/uibase/ifiletree.h
 	../include/uibase/iinstallationmanager.h
 	../include/uibase/imodinterface.h
 	../include/uibase/imodlist.h
 	../include/uibase/imodrepositorybridge.h
 	../include/uibase/imoinfo.h
-	../include/uibase/installationtester.h
 	../include/uibase/iplugin.h
 	../include/uibase/iplugindiagnose.h
 	../include/uibase/ipluginfilemapper.h
@@ -96,23 +55,13 @@ source_group(src/interfaces FILES
 	../include/uibase/iprofile.h
 	../include/uibase/isavegame.h
 	../include/uibase/isavegameinfowidget.h
-
-	ifiletree.cpp
-	imodrepositorybridge.cpp
-	imoinfo.cpp
-	iplugininstaller.cpp
 )
-
-source_group(src/tutorials FILES
+set(tutorial_headers
 	../include/uibase/tutorabledialog.h
 	../include/uibase/tutorialcontrol.h
 	../include/uibase/tutorialmanager.h
-	tutorabledialog.cpp
-	tutorialcontrol.cpp
-	tutorialmanager.cpp
 )
-
-source_group(src/widgets FILES
+set(widget_headers
 	../include/uibase/expanderwidget.h
 	../include/uibase/filterwidget.h
 	../include/uibase/finddialog.h
@@ -123,7 +72,82 @@ source_group(src/widgets FILES
 	../include/uibase/taskprogressmanager.h
 	../include/uibase/textviewer.h
 	../include/uibase/widgetutility.h
+)
+set(game_features_header
+	../include/uibase/game_features/bsainvalidation.h
+	../include/uibase/game_features/dataarchives.h
+	../include/uibase/game_features/game_feature.h
+	../include/uibase/game_features/gameplugins.h
+	../include/uibase/game_features/igamefeatures.h
+	../include/uibase/game_features/localsavegames.h
+	../include/uibase/game_features/moddatachecker.h
+	../include/uibase/game_features/moddatacontent.h
+	../include/uibase/game_features/savegameinfo.h
+	../include/uibase/game_features/scriptextender.h
+	../include/uibase/game_features/unmanagedmods.h
+)
+set(formatters_header
+	../include/uibase/formatters/enums.h
+	../include/uibase/formatters/qt.h
+	../include/uibase/formatters/random_access_containers.h
+	../include/uibase/formatters/strings.h
+	../include/uibase/formatters.h
+)
+
+add_library(uibase SHARED)
+mo2_configure_target(uibase NO_SOURCES WARNINGS ON EXTERNAL_WARNINGS ON)
+mo2_default_source_group()
+
+mo2_target_sources(uibase
+	FOLDER src
+	PRIVATE
+	${root_headers}
+	delayedfilewriter.cpp
+	diagnosisreport.cpp
+	errorcodes.cpp
+	eventfilter.cpp
+	executableinfo.cpp
+	filesystemutilities.cpp
+	guessedvalue.cpp
+	json.cpp
+	log.cpp
+	modrepositoryfileinfo.cpp
+	nxmurl.cpp
+	pch.cpp
+	pluginrequirements.cpp
+	pluginsetting.cpp
+	registry.cpp
+	report.cpp
+	safewritefile.cpp
+	scopeguard.cpp
+	steamutility.cpp
+	utility.cpp
+	versioninfo.cpp
+)
+
+mo2_target_sources(uibase
+	FOLDER src/interfaces
+	PRIVATE
+	${interface_headers}
+	ifiletree.cpp
+	imodrepositorybridge.cpp
+	imoinfo.cpp
+	iplugininstaller.cpp
+)
+
+mo2_target_sources(uibase
+	FOLDER src/tutorials
+	PRIVATE
+	${tutorial_headers}
+	tutorabledialog.cpp
+	tutorialcontrol.cpp
+	tutorialmanager.cpp
+)
 
+mo2_target_sources(uibase
+	FOLDER src/widgets
+	PRIVATE
+	${widget_headers}
 	expanderwidget.cpp
 	finddialog.cpp
 	lineeditclear.cpp
@@ -133,13 +157,59 @@ source_group(src/widgets FILES
 	taskprogressmanager.cpp
 	textviewer.cpp
 	widgetutility.cpp
-    filterwidget.cpp
+	filterwidget.cpp
+)
+
+mo2_target_sources(uibase FOLDER src/formatters	PRIVATE ${formatters_header})
+mo2_target_sources(uibase FOLDER src/game_features	PRIVATE ${game_features_header})
+
+target_sources(uibase
+	PRIVATE
+		finddialog.ui
+		questionboxmemory.ui
+		taskdialog.ui
+		textviewer.ui
+
+		version.rc
+
+		${root_headers}
+		pch.h
+
+	PUBLIC
+		FILE_SET HEADERS
+		BASE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../include
+		FILES
+			${root_headers}
+			${interface_headers}
+			${tutorial_headers}
+			${widget_headers}
+			${game_features_header}
+			${formatters_header}
 )
 
-get_target_property(game_features uibase HEADER_SET_HEADERS)
-list(FILTER game_features INCLUDE REGEX ".*game_features.*")
-source_group(src/game_features FILES ${game_features})
+set_target_properties(uibase PROPERTIES DEBUG_POSTFIX d)
+
+# TODO: remove this after fixing UIBase #include<> directives
+target_include_directories(uibase PRIVATE
+	$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/uibase>
+	$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/uibase/game_features>
+)
+
+add_library(mo2::uibase ALIAS uibase)
+
+target_compile_definitions(uibase PRIVATE -DUIBASE_EXPORT SPDLOG_USE_STD_FORMAT)
+
+target_link_libraries(uibase
+	PUBLIC Qt6::Widgets Qt6::Network Qt6::QuickWidgets
+	PRIVATE
+		Boost::headers Boost::thread spdlog::spdlog_header_only
+		Qt6::Qml Qt6::Quick Version)
 
-get_target_property(formatters uibase HEADER_SET_HEADERS)
-list(FILTER formatters INCLUDE REGEX ".*formatters.*")
-source_group(src/formatters FILES ${formatters})
+# installation
+install(TARGETS uibase EXPORT uibaseTargets FILE_SET HEADERS)
+install(FILES $<TARGET_PDB_FILE:uibase> DESTINATION pdb)
+install(EXPORT uibaseTargets
+	FILE mo2-uibase-targets.cmake
+	NAMESPACE mo2::
+	DESTINATION lib/cmake/mo2-uibase
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 3.16)
 
 add_executable(uibase-tests EXCLUDE_FROM_ALL)
-mo2_configure_tests(uibase-tests WARNINGS OFF)
+target_sources(uibase-tests
+	PRIVATE
+		test_formatters.cpp
+		test_ifiletree.cpp
+)
+mo2_configure_tests(uibase-tests NO_SOURCES WARNINGS 4)
 target_link_libraries(uibase-tests PRIVATE uibase)
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -14,7 +14,7 @@
     {
       "kind": "git",
       "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
-      "baseline": "27d8adbfe9e4ce88a875be3a45fadab69869eb60",
+      "baseline": "09c389ef37bcec89b28f13105be959fecf4f3975",
       "packages": ["mo2-cmake", "spdlog"]
     }
   ]