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

Holt59 · Holt59 · commit 7e462a42e9f4 · 2024-08-02T15:23:16.000+02:00
diff --git a/src/mobase/CMakeLists.txt b/src/mobase/CMakeLists.txt
@@ -4,11 +4,35 @@ find_package(Qt6 COMPONENTS Core)
 find_package(mo2-uibase CONFIG REQUIRED)
 
 pybind11_add_module(mobase MODULE)
+mo2_default_source_group()
 mo2_configure_target(mobase
-	SOURCE_TREE
+	NO_SOURCES
 	WARNINGS 4
 	EXTERNAL_WARNINGS 4
 	AUTOMOC ON
 	TRANSLATIONS OFF
 )
+mo2_target_sources(mobase
+	FOLDER src
+	PRIVATE
+		deprecation.cpp
+		deprecation.h
+		mobase.cpp
+		pybind11_all.h
+)
+mo2_target_sources(mobase
+	FOLDER src/wrappers
+	PRIVATE
+		./wrappers/basic_classes.cpp
+		./wrappers/game_features.cpp
+		./wrappers/known_folders.h
+		./wrappers/pyfiletree.cpp
+		./wrappers/pyfiletree.h
+		./wrappers/pyplugins.cpp
+		./wrappers/pyplugins.h
+		./wrappers/utils.cpp
+		./wrappers/widgets.cpp
+		./wrappers/wrappers.cpp
+		./wrappers/wrappers.h
+)
 target_link_libraries(mobase PRIVATE pybind11::qt pybind11::utils mo2::uibase Qt6::Core)
diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt
@@ -4,15 +4,17 @@ find_package(mo2-uibase CONFIG REQUIRED)
 
 set(PLUGIN_NAME "plugin_python")
 
-add_library(proxy SHARED)
+add_library(proxy SHARED proxypython.cpp proxypython.h)
 mo2_configure_plugin(proxy
+    NO_SOURCES
     WARNINGS 4
     EXTERNAL_WARNINGS 4
     TRANSLATIONS OFF
     EXTRA_TRANSLATIONS
     ${CMAKE_CURRENT_SOURCE_DIR}/../runner
     ${CMAKE_CURRENT_SOURCE_DIR}/../mobase
     ${CMAKE_CURRENT_SOURCE_DIR}/../pybind11-qt)
+mo2_default_source_group()
 target_link_libraries(proxy PRIVATE runner mo2::uibase)
 set_target_properties(proxy PROPERTIES OUTPUT_NAME ${PLUGIN_NAME})
 mo2_install_plugin(proxy FOLDER)
diff --git a/src/proxy/resource.h b/src/proxy/resource.h
diff --git a/src/pybind11-qt/CMakeLists.txt b/src/pybind11-qt/CMakeLists.txt
@@ -6,12 +6,37 @@ mo2_find_python_executable(PYTHON_EXE)
 
 add_library(pybind11-qt STATIC)
 mo2_configure_target(pybind11-qt
-	SOURCE_TREE
+	NO_SOURCES
 	WARNINGS 4
 	EXTERNAL_WARNINGS 4
 	AUTOMOC OFF
 	TRANSLATIONS OFF
 )
+mo2_default_source_group()
+target_sources(pybind11-qt
+	PRIVATE
+		./include/pybind11_qt/pybind11_qt_basic.h
+		./include/pybind11_qt/pybind11_qt_containers.h
+		./include/pybind11_qt/pybind11_qt_enums.h
+		./include/pybind11_qt/pybind11_qt_holder.h
+		./include/pybind11_qt/pybind11_qt_objects.h
+		./include/pybind11_qt/pybind11_qt_qflags.h
+		./include/pybind11_qt/pybind11_qt.h
+
+		pybind11_qt_basic.cpp
+		pybind11_qt_sip.cpp
+		pybind11_qt_utils.cpp
+
+)
+mo2_target_sources(pybind11-qt
+	FOLDER src/details
+	PRIVATE
+		./include/pybind11_qt/details/pybind11_qt_enum.h
+		./include/pybind11_qt/details/pybind11_qt_qlist.h
+		./include/pybind11_qt/details/pybind11_qt_qmap.h
+		./include/pybind11_qt/details/pybind11_qt_sip.h
+		./include/pybind11_qt/details/pybind11_qt_utils.h
+)
 target_link_libraries(pybind11-qt PUBLIC pybind11::pybind11 PRIVATE Qt6::Core Qt6::Widgets)
 target_include_directories(pybind11-qt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
@@ -20,11 +45,12 @@ target_compile_definitions(pybind11-qt PUBLIC QT_NO_KEYWORDS)
 
 # we need sip.h for pybind11-qt
 add_custom_target(PyQt6-siph DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/sip.h")
+set_target_properties(PyQt6-siph PROPERTIES FOLDER autogen)
 add_custom_command(
 	OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/sip.h"
 	COMMAND
-		${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_BINARY_DIR}/pylibs
-		${CMAKE_BINARY_DIR}/pylibs/bin/sip-module.exe
+		${CMAKE_COMMAND} -E env PYTHONPATH=${MO2_PYLIBS_DIR}
+		${MO2_PYLIBS_DIR}/bin/sip-module.exe
 		--sip-h PyQt${MO2_QT_VERSION_MAJOR}.sip
 		--target-dir ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/src/pybind11-utils/CMakeLists.txt b/src/pybind11-utils/CMakeLists.txt
@@ -1,13 +1,21 @@
 cmake_minimum_required(VERSION 3.16)
 
-add_library(pybind11-utils STATIC)
+add_library(pybind11-utils STATIC
+	./include/pybind11_utils/functional.h
+	./include/pybind11_utils/shared_cpp_owner.h
+	./include/pybind11_utils/smart_variant_wrapper.h
+	./include/pybind11_utils/smart_variant.h
+
+	functional.cpp
+)
 mo2_configure_target(pybind11-utils
-	SOURCE_TREE
+	NO_SOURCES
 	WARNINGS 4
 	EXTERNAL_WARNINGS 4
 	AUTOMOC OFF
 	TRANSLATIONS OFF
 )
+mo2_default_source_group()
 target_link_libraries(pybind11-utils PUBLIC pybind11::pybind11)
 target_include_directories(pybind11-utils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt
@@ -2,14 +2,21 @@ cmake_minimum_required(VERSION 3.16)
 
 find_package(mo2-uibase CONFIG REQUIRED)
 
-add_library(runner SHARED)
+add_library(runner SHARED
+	error.h
+	pythonrunner.cpp
+	pythonrunner.h
+	pythonutils.h
+	pythonutils.cpp
+)
 mo2_configure_target(runner
-	SOURCE_TREE
+	NO_SOURCES
 	WARNINGS 4
 	EXTERNAL_WARNINGS 4
 	AUTOMOC ON
 	TRANSLATIONS OFF
 )
+mo2_default_source_group()
 target_link_libraries(runner PUBLIC mo2::uibase PRIVATE pybind11::embed pybind11::qt)
 target_include_directories(runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(runner PRIVATE RUNNER_BUILD)
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
@@ -11,6 +11,19 @@ set(PYLIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/pylibs)
 set(UIBASE_PATH $<TARGET_FILE_DIR:mo2::uibase>)
 
 add_custom_target(python-tests)
+target_sources(python-tests
+	PRIVATE
+		conftest.py
+		test_argument_wrapper.py
+		test_filetree.py
+		test_functional.py
+		test_guessed_string.py
+		test_organizer.py
+		test_path_wrappers.py
+		test_qt_widgets.py
+		test_qt.py
+		test_shared_cpp_owner.py
+)
 
 add_test(NAME pytest
 	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/pylibs/bin/pytest.exe ${CMAKE_CURRENT_SOURCE_DIR} -s
diff --git a/tests/runner/CMakeLists.txt b/tests/runner/CMakeLists.txt
@@ -5,8 +5,33 @@ cmake_minimum_required(VERSION 3.22)
 
 # first we configure the tests as with other tests
 add_executable(runner-tests EXCLUDE_FROM_ALL)
-
-mo2_configure_tests(runner-tests WARNINGS OFF)
+mo2_default_source_group()
+mo2_target_sources(runner-tests
+	FOLDER src
+	PRIVATE
+		test_diagnose.cpp
+		test_filemapper.cpp
+		test_game.cpp
+		test_installer.cpp
+		test_iplugin.cpp
+		test_lifetime.cpp
+)
+mo2_target_sources(runner-tests
+	FOLDER src/mocks
+	PRIVATE
+		../mocks/DummyFileTree.h
+		../mocks/MockOrganizer.h
+)
+mo2_target_sources(runner-tests
+	FOLDER src/plugins
+	PRIVATE
+		plugins/dummy-diagnose.py
+		plugins/dummy-filemapper.py
+		plugins/dummy-game.py
+		plugins/dummy-installer.py
+		plugins/dummy-iplugin.py
+)
+mo2_configure_tests(runner-tests NO_SOURCES WARNINGS 4)
 
 set_target_properties(runner-tests PROPERTIES FOLDER tests/runner)
 
@@ -25,8 +50,8 @@ target_include_directories(runner-tests
 set(PYLIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/pylibs)
 mo2_python_pip_install(runner-tests
 	DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pylibs
-  PACKAGES
-    pytest
+	PACKAGES
+		pytest
 		PyQt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION}
 		PyQt${MO2_QT_VERSION_MAJOR}-Qt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION})
 
diff --git a/vcpkg.json b/vcpkg.json
@@ -20,13 +20,13 @@
       {
         "kind": "git",
         "repository": "https://github.com/Microsoft/vcpkg",
-        "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
+        "baseline": "2c0f34f7cfd36eec05faf7e47a390fbceabf16d2",
         "packages": ["boost*", "boost-*"]
       },
       {
         "kind": "git",
         "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
-        "baseline": "70c0aacd6962073dae6e46c2e810c91aa755d2e2",
+        "baseline": "911c07c041c1b9f83b9a645d0eeb9bba2e5596e1",
         "packages": ["mo2-*", "pybind11", "spdlog"]
       }
     ]

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,13 @@`
`20`	`20`	`{`
`21`	`21`	`"kind": "git",`
`22`	`22`	`"repository": "https://github.com/Microsoft/vcpkg",`
`23`		`- "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",`
	`23`	`+ "baseline": "2c0f34f7cfd36eec05faf7e47a390fbceabf16d2",`
`24`	`24`	`"packages": ["boost", "boost-"]`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"kind": "git",`
`28`	`28`	`"repository": "https://github.com/ModOrganizer2/vcpkg-registry",`
`29`		`- "baseline": "70c0aacd6962073dae6e46c2e810c91aa755d2e2",`
	`29`	`+ "baseline": "911c07c041c1b9f83b9a645d0eeb9bba2e5596e1",`
`30`	`30`	`"packages": ["mo2-*", "pybind11", "spdlog"]`
`31`	`31`	`}`
`32`	`32`	`]`