Merge branch 'feature/static-linkage' into 'main'

Support static linkage of module plugins for static builds. See merge request asxa86/aspire!13
ASxa86 · Nov 10, 2024 · cf65b32 · cf65b32
2 parents b906e18 + 72673a9
commit cf65b32
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 18 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,23 +5,13 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(Windows) Aspire Edit Debug",
+            "name": "(Windows) Pong Debug",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/build-debug/installed/bin/aspire-edit.exe",
+            "program": "${workspaceFolder}/build/installed/bin/pong.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/build-debug/installed/bin",
-            "console": "externalTerminal"
-        },
-        {
-            "name": "(Windows) Aspire EDH Debug",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/build-debug/installed/bin/aspire-edh.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/build-debug/installed/bin",
+            "cwd": "${workspaceFolder}/build/installed/bin",
             "console": "externalTerminal"
         }
     ]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,5 +34,5 @@ qt_standard_project_setup(REQUIRES 6.7)
 
 set(CMAKE_AUTOMOC ON)
 
-add_subdirectory(app)
 add_subdirectory(module)
+add_subdirectory(app)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -10,6 +10,7 @@
         "cmake/preset/host-x64-linux.json",
         "cmake/preset/host-x64-windows.json",
         "cmake/preset/target-arm64-android.json",
+        "cmake/preset/target-arm64-osx.json",
         "cmake/preset/target-arm64-windows.json",
         "cmake/preset/target-x64-android.json",
         "cmake/preset/target-x64-linux.json",
@@ -97,6 +98,7 @@
             "name": "arm64-osx-clang-debug",
             "inherits": [
                 "host-arm64-osx",
+                "target-arm64-osx",
                 "config-debug",
                 "config-build-dir",
                 "use-clang",
@@ -108,6 +110,7 @@
             "name": "arm64-osx-clang-release",
             "inherits": [
                 "host-arm64-osx",
+                "target-arm64-osx",
                 "config-release",
                 "config-build-dir",
                 "use-clang",

diff --git a/app/pong/CMakeLists.txt b/app/pong/CMakeLists.txt
@@ -20,6 +20,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt::Quick
 )
 
+# Link against plugins for static builds.
+if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin OR ${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        aspireplugin
+    )
+endif()
+
+# Android APKs are handle separately within Qt cmake scripts.
 if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL Android)
     install(TARGETS ${PROJECT_NAME}
         BUNDLE DESTINATION .

diff --git a/cmake/preset/host-arm64-osx.json b/cmake/preset/host-arm64-osx.json
@@ -10,8 +10,7 @@
                 "rhs": "Darwin"
             },
             "cacheVariables": {
-                "VCPKG_HOST_TRIPLET": "arm64-osx-release",
-                "VCPKG_TARGET_TRIPLET": "arm64-osx-release"
+                "VCPKG_HOST_TRIPLET": "arm64-osx-aspire"
             }
         }
     ]

diff --git a/cmake/preset/target-arm64-osx.json b/cmake/preset/target-arm64-osx.json
@@ -0,0 +1,13 @@
+{
+    "version": 6,
+    "configurePresets": [
+        {
+            "name": "target-arm64-osx",
+            "hidden": true,
+            "cacheVariables": {
+                "VCPKG_TARGET_TRIPLET": "arm64-osx-aspire",
+                "BUILD_SHARED_LIBS": false
+            }
+        }
+    ]
+}
diff --git a/cmake/preset/target-x64-linux.json b/cmake/preset/target-x64-linux.json
@@ -5,7 +5,8 @@
             "name": "target-x64-linux",
             "hidden": true,
             "cacheVariables": {
-                "VCPKG_TARGET_TRIPLET": "x64-linux-aspire"
+                "VCPKG_TARGET_TRIPLET": "x64-linux-aspire",
+                "BUILD_SHARED_LIBS": false
             }
         }
     ]

diff --git a/module/aspire/test/CMakeLists.txt b/module/aspire/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(aspire-test)
 
-qt_add_executable(${PROJECT_NAME})
+add_executable(${PROJECT_NAME})
 
 target_sources(${PROJECT_NAME} PRIVATE
     main.cpp