From 09a02523868c28c8e478d60861a04e6d5a6858f2 Mon Sep 17 00:00:00 2001 From: ruinivist <179396038+ruinivist@users.noreply.github.com> Date: Sat, 30 May 2026 20:57:01 +0000 Subject: [PATCH] fix: include cppbridge library in package build output Configure CMake to output `libcppbridgeplugin.so` to the package directory and set `$ORIGIN` runtime path so that it is properly bundled and resolved when distributed as a .plasmoid zip archive. --- cpp/CMakeLists.txt | 9 +++++++++ cpp/CMakePresets.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1dcee43..1b8349a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -36,4 +36,13 @@ target_link_libraries(cppbridgeplugin PRIVATE set_target_properties(cppbridgeplugin PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../package/contents/ui/cppbridge" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../package/contents/ui/cppbridge" + BUILD_WITH_INSTALL_RPATH TRUE + INSTALL_RPATH "$ORIGIN" +) + +set_target_properties(cppbridgepluginplugin PROPERTIES + BUILD_WITH_INSTALL_RPATH TRUE + INSTALL_RPATH "$ORIGIN" ) diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index ba467d7..bb82dac 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -13,8 +13,8 @@ "generator": "Unix Makefiles", "binaryDir": "${sourceDir}/../build/cpp", "cacheVariables": { - "CMAKE_C_COMPILER": "clang", - "CMAKE_CXX_COMPILER": "clang++", + "CMAKE_C_COMPILER": "gcc", + "CMAKE_CXX_COMPILER": "g++", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } }