CMake: Split Library and Plugin types into PROBE and UI; support BUIL…

…D_SHARED_LIBS

User's choice of what's to be built is disambiguated from
how it's built. Both static and shared builds of both library
and plugins is now supported.

3rdparty/kde/CMakeLists.txt

@@ -5,7 +5,7 @@ set(gammaray_kitemmodels_srcs
   kitemmodels_debug.cpp
 )
 
-add_library(gammaray_kitemmodels SHARED ${gammaray_kitemmodels_srcs})
+add_library(gammaray_kitemmodels ${GAMMARAY_PROBE_LIBRARY_TYPE} ${gammaray_kitemmodels_srcs})
 
 target_link_libraries(gammaray_kitemmodels PUBLIC Qt::Core)
 

3rdparty/kuserfeedback/CMakeLists.txt

@@ -25,7 +25,7 @@ list(APPEND gammaray_userfeedback_srcs
     widgets/auditlogbrowserdialog.cpp
 )
 
-add_library(gammaray_kuserfeedback SHARED ${gammaray_userfeedback_srcs})
+add_library(gammaray_kuserfeedback ${GAMMARAY_UI_LIBRARY_TYPE} ${gammaray_userfeedback_srcs})
 # Disable warnings for generated stuff
 if(MSVC)
     set_source_files_properties(common/surveytargetexpressionlexer.cpp PROPERTIES COMPILE_FLAGS "/wd4018 /wd4996")

CMakeLists.txt

@@ -222,31 +222,33 @@ message(STATUS "Building GammaRay ${GAMMARAY_VERSION_STRING} in ${CMAKE_BUILD_TY
 #
 # Build options
 #
-set(GAMMARAY_BUILD_UI_DEFAULT ON)
-if(QNXNTO OR ANDROID)
-    set(GAMMARAY_BUILD_UI_DEFAULT OFF)
-endif()
+option(BUILD_SHARED_LIBS "Build GammaRay statically or dynamically" ON)
 
+set(GAMMARAY_STATIC_PROBE_DEFAULT OFF)
+if(NOT BUILD_SHARED_LIBS)
+    set(GAMMARAY_STATIC_PROBE_DEFAULT ON)
+endif()
 gammaray_option(
-    GAMMARAY_PROBE_ONLY_BUILD "Build only an additional probe configuration for an already existing launcher." OFF
+    GAMMARAY_STATIC_PROBE "Build the probe as static library for compile-time injection." ${GAMMARAY_STATIC_PROBE_DEFAULT}
 )
 
+gammaray_option(GAMMARAY_PROBE_ONLY_BUILD "Build only an additional probe configuration for an already existing launcher." OFF)
 gammaray_option(GAMMARAY_CLIENT_ONLY_BUILD "Build the client part only." OFF)
 
-if(GAMMARAY_CLIENT_ONLY_BUILD)
-    set(GAMMARAY_BUILD_UI_DEFAULT ON)
+if(GAMMARAY_PROBE_ONLY_BUILD AND GAMMARAY_CLIENT_ONLY_BUILD)
+    message(FATAL_ERROR "You can only use one of the *ONLY* option.")
 endif()
 
-if(GAMMARAY_PROBE_ONLY_BUILD)
+set(GAMMARAY_BUILD_UI_DEFAULT ON)
+if(GAMMARAY_CLIENT_ONLY_BUILD)
+    set(GAMMARAY_BUILD_UI_DEFAULT ON)
+elseif(GAMMARAY_PROBE_ONLY_BUILD)
+    set(GAMMARAY_BUILD_UI_DEFAULT OFF)
+elseif(QNXNTO OR ANDROID)
     set(GAMMARAY_BUILD_UI_DEFAULT OFF)
 endif()
-
 gammaray_option(GAMMARAY_BUILD_UI "Build the GammaRay client and in-process UI." ${GAMMARAY_BUILD_UI_DEFAULT})
 
-if(GAMMARAY_PROBE_ONLY_BUILD AND GAMMARAY_CLIENT_ONLY_BUILD)
-    message(FATAL_ERROR "You can only use one of the *ONLY* option.")
-endif()
-
 gammaray_option(GAMMARAY_INSTALL_QT_LAYOUT "Install into Qt directory layout." OFF)
 gammaray_option(GAMMARAY_MULTI_BUILD "Build multiple applicable probe configurations." ON)
 gammaray_option(GAMMARAY_BUILD_CLI_INJECTOR "Build command line injector on Windows." ON)
@@ -258,7 +260,6 @@ if(GAMMARAY_PROBE_ONLY_BUILD OR CMAKE_CROSSCOMPILING)
     set(GAMMARAY_DISABLE_FEEDBACK_DEFAULT ON)
 endif()
 gammaray_option(GAMMARAY_BUILD_DOCS "Build GammaRay documentation." ${GAMMARAY_BUILD_DOCS_DEFAULT})
-gammaray_option(GAMMARAY_STATIC_PROBE "Build the probe as static library for compile-time injection." OFF)
 
 gammaray_option(GAMMARAY_ENFORCE_QT_ASSERTS "Force QT_ASSERT in all builds." OFF)
 
@@ -267,15 +268,18 @@ gammaray_option(GAMMARAY_DISABLE_FEEDBACK "Disable user feedback support." ${GAM
 #
 # Static probe setup
 #
-if(GAMMARAY_STATIC_PROBE)
-    set(GAMMARAY_BUILD_UI OFF)
-    set(GAMMARAY_PROBE_ONLY_BUILD ON)
+set(GAMMARAY_UI_LIBRARY_TYPE SHARED)
+set(GAMMARAY_UI_PLUGIN_TYPE MODULE)
+if(NOT BUILD_SHARED_LIBS)
+    set(GAMMARAY_UI_LIBRARY_TYPE STATIC)
+    set(GAMMARAY_UI_PLUGIN_TYPE STATIC)
+endif()
 
-    set(GAMMARAY_LIBRARY_TYPE STATIC)
-    set(GAMMARAY_PLUGIN_TYPE STATIC)
-else()
-    set(GAMMARAY_LIBRARY_TYPE SHARED)
-    set(GAMMARAY_PLUGIN_TYPE MODULE)
+set(GAMMARAY_PROBE_LIBRARY_TYPE ${GAMMARAY_UI_LIBRARY_TYPE})
+set(GAMMARAY_PROBE_PLUGIN_TYPE ${GAMMARAY_UI_PLUGIN_TYPE})
+if(GAMMARAY_STATIC_PROBE)
+    set(GAMMARAY_PROBE_LIBRARY_TYPE STATIC)
+    set(GAMMARAY_PROBE_PLUGIN_TYPE STATIC)
 endif()
 
 gammaray_option(GAMMARAY_USE_PCH "Enable Precompiled Headers support" OFF)

GammaRayConfig.cmake.in

@@ -24,8 +24,10 @@ set(GAMMARAY_BUILD_UI @GAMMARAY_BUILD_UI@)
 set(GAMMARAY_PROBE_ONLY_BUILD @GAMMARAY_PROBE_ONLY_BUILD@)
 
 set(GAMMARAY_STATIC_PROBE @GAMMARAY_STATIC_PROBE@)
-set(GAMMARAY_LIBRARY_TYPE @GAMMARAY_LIBRARY_TYPE@)
-set(GAMMARAY_PLUGIN_TYPE @GAMMARAY_PLUGIN_TYPE@)
+set(GAMMARAY_UI_LIBRARY_TYPE @GAMMARAY_UI_LIBRARY_TYPE@)
+set(GAMMARAY_UI_PLUGIN_TYPE @GAMMARAY_UI_PLUGIN_TYPE@)
+set(GAMMARAY_PROBE_LIBRARY_TYPE @GAMMARAY_PROBE_LIBRARY_TYPE@)
+set(GAMMARAY_PROBE_PLUGIN_TYPE @GAMMARAY_PROBE_PLUGIN_TYPE@)
 set(GAMMARAY_INSTALL_QT_LAYOUT @GAMMARAY_INSTALL_QT_LAYOUT@)
 
 if(NOT GAMMARAY_OUTPUT_PREFIX)

client/CMakeLists.txt

@@ -54,7 +54,7 @@ elseif(WIN32)
 endif()
 
 add_library(
-    gammaray_client SHARED
+    gammaray_client ${GAMMARAY_UI_LIBRARY_TYPE}
     ${gammaray_clientlib_srcs}
 )
 generate_export_header(gammaray_client)
@@ -72,7 +72,7 @@ target_link_libraries(
     gammaray_client
     PUBLIC Qt::Core
     PRIVATE gammaray_ui
-            gammaray_ui_internal
+            $<TARGET_OBJECTS:gammaray_ui_internal>
             gammaray_common
             Qt::Gui
             Qt::Widgets

cmake/GammaRayMacros.cmake

@@ -17,7 +17,7 @@ include(CMakeParseArguments)
 # - SOURCES <files> - the plugin sources
 #
 macro(gammaray_add_plugin _target_name)
-    set(oneValueArgs JSON)
+    set(oneValueArgs JSON TYPE)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(
         _gammaray_add_plugin
@@ -27,12 +27,19 @@ macro(gammaray_add_plugin _target_name)
         ${ARGN}
     )
 
+    set(_type_options UI PROBE)
+    if (NOT DEFINED _gammaray_add_plugin_TYPE)
+        set(_gammaray_add_plugin_TYPE PROBE)
+    elseif(NOT _gammaray_add_plugin_TYPE IN_LIST _type_options)
+        message(FATAL_ERROR "Plugin type must be either PROBE or UI")
+    endif()
+
     if(NOT PROBE_PLUGIN_INSTALL_DIR) # HACK for external plugins that don't set PLUGIN_INSTALL_DIR
         set(PROBE_PLUGIN_INSTALL_DIR ${GAMMARAY_PROBE_PLUGIN_INSTALL_DIR})
     endif()
     set(_build_target_dir "${GAMMARAY_OUTPUT_PREFIX}/${PROBE_PLUGIN_INSTALL_DIR}")
 
-    add_library(${_target_name} ${GAMMARAY_PLUGIN_TYPE} ${_gammaray_add_plugin_SOURCES})
+    add_library(${_target_name} ${GAMMARAY_${_gammaray_add_plugin_TYPE}_PLUGIN_TYPE} ${_gammaray_add_plugin_SOURCES})
     set_target_properties(${_target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${_build_target_dir})
     set_target_properties(${_target_name} PROPERTIES PREFIX "")
     if(GAMMARAY_STATIC_PROBE)

common/CMakeLists.txt

@@ -80,7 +80,7 @@ set(gammaray_common_srcs
 
 add_library(
     gammaray_common
-    ${GAMMARAY_LIBRARY_TYPE} ${gammaray_common_srcs}
+    ${GAMMARAY_PROBE_LIBRARY_TYPE} ${gammaray_common_srcs}
 )
 generate_export_header(gammaray_common)
 # cmake-lint: disable=E1120

core/CMakeLists.txt

@@ -202,7 +202,7 @@ endif()
 # core lib
 add_library(
     gammaray_core
-    ${GAMMARAY_LIBRARY_TYPE} ${gammaray_srcs}
+    ${GAMMARAY_PROBE_LIBRARY_TYPE} ${gammaray_srcs}
 )
 generate_export_header(gammaray_core)
 target_compile_features(gammaray_core PUBLIC ${GAMMARAY_REQUIRED_CXX_FEATURES})

inprocessui/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(
     main.cpp
 )
 target_link_libraries(
-    gammaray_inprocessui gammaray_core gammaray_ui_internal
+    gammaray_inprocessui gammaray_core $<TARGET_OBJECTS:gammaray_ui_internal>
 )
 set_target_properties(
     gammaray_inprocessui PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY

launcher/core/CMakeLists.txt

@@ -75,7 +75,7 @@ else()
 endif()
 
 add_library(
-    gammaray_launcher SHARED
+    gammaray_launcher ${GAMMARAY_UI_LIBRARY_TYPE}
     ${gammaray_launcher_shared_srcs}
 )
 generate_export_header(gammaray_launcher)

launcher/ui/CMakeLists.txt

@@ -35,7 +35,7 @@ else()
 endif()
 
 add_library(
-    gammaray_launcher_ui SHARED
+    gammaray_launcher_ui ${GAMMARAY_UI_LIBRARY_TYPE}
     ${gammaray_launcher_ui_srcs}
 )
 generate_export_header(gammaray_launcher_ui)

plugins/actioninspector/CMakeLists.txt

@@ -24,6 +24,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_actioninspector.json
         SOURCES
         ${gammaray_actioninspector_plugin_srcs}
+        TYPE PROBE
     )
 
     target_link_libraries(gammaray_actioninspector_plugin Qt::Gui Qt::Widgets gammaray_core)
@@ -41,6 +42,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_actioninspector.json
         SOURCES
         ${gammaray_actioninspector_ui_plugin_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_actioninspector_ui_plugin gammaray_ui)

plugins/bluetooth/CMakeLists.txt

@@ -16,6 +16,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         SOURCES
         bluetooth.cpp
         bluetooth.h
+        TYPE PROBE
     )
     target_link_libraries(gammaray_bluetooth gammaray_core Qt::Bluetooth)
     set_target_properties(gammaray_bluetooth PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)

plugins/codecbrowser/CMakeLists.txt

@@ -17,6 +17,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_codecbrowser.json
         SOURCES
         ${gammaray_codecbrowser_plugin_srcs}
+        TYPE PROBE
     )
     set_target_properties(gammaray_codecbrowser_plugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
 
@@ -34,6 +35,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_codecbrowser.json
         SOURCES
         ${gammaray_codecbrowser_plugin_ui_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_codecbrowser_ui_plugin gammaray_common gammaray_ui)

plugins/eventmonitor/CMakeLists.txt

@@ -29,6 +29,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_eventmonitor.json
         SOURCES
         ${gammaray_eventmonitor_plugin_srcs}
+        TYPE PROBE
     )
 
     target_link_libraries(gammaray_eventmonitor_plugin Qt::Gui Qt::CorePrivate gammaray_core)
@@ -53,6 +54,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_eventmonitor.json
         SOURCES
         ${gammaray_eventmonitor_ui_plugin_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_eventmonitor_ui_plugin gammaray_ui)

plugins/fontbrowser/CMakeLists.txt

@@ -28,6 +28,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_fontbrowser.json
         SOURCES
         ${gammaray_fontbrowser_plugin_srcs}
+        TYPE PROBE
     )
 
     target_link_libraries(gammaray_fontbrowser_plugin gammaray_core)
@@ -52,6 +53,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_fontbrowser.json
         SOURCES
         ${gammaray_fontbrowser_plugin_ui_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_fontbrowser_ui_plugin gammaray_common gammaray_ui)

plugins/guisupport/CMakeLists.txt

@@ -16,6 +16,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_guisupport.json
         SOURCES
         ${gammaray_guisupport_srcs}
+        TYPE PROBE
     )
     target_link_libraries(gammaray_guisupport gammaray_core Qt::Gui Qt::GuiPrivate)
 endif()
@@ -31,6 +32,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_guisupport.json
         SOURCES
         ${gammaray_guisupport_ui_srcs}
+        TYPE UI
     )
     target_link_libraries(gammaray_guisupport_ui gammaray_ui)
 endif()

plugins/kjobtracker/CMakeLists.txt

@@ -27,6 +27,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
             gammaray_kjobtracker.json
             SOURCES
             ${gammaray_kjob_plugin_srcs}
+            TYPE PROBE
         )
 
         target_link_libraries(gammaray_kjobtracker_plugin gammaray_core KF${QtCore_VERSION_MAJOR}::CoreAddons Qt::Gui)
@@ -43,6 +44,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_kjobtracker.json
         SOURCES
         ${gammaray_kjob_ui_plugin_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_kjobtracker_ui_plugin gammaray_ui)

plugins/localeinspector/CMakeLists.txt

@@ -34,6 +34,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_localeinspector.json
         SOURCES
         ${gammaray_localeinspector_plugin_srcs}
+        TYPE PROBE
     )
     set_target_properties(gammaray_localeinspector_plugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
 
@@ -61,6 +62,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_localeinspector.json
         SOURCES
         ${gammaray_localeinspector_plugin_ui_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_localeinspector_ui_plugin gammaray_ui)

plugins/mimetypes/CMakeLists.txt

@@ -16,6 +16,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_mimetypes.json
         SOURCES
         ${gammaray_mimetypes_srcs}
+        TYPE PROBE
     )
     target_link_libraries(gammaray_mimetypes gammaray_core Qt::Gui gammaray_kitemmodels)
 endif()
@@ -29,6 +30,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_mimetypes.json
         SOURCES
         ${gammaray_mimetypes_ui_srcs}
+        TYPE UI
     )
     target_link_libraries(gammaray_mimetypes_ui gammaray_ui)
 endif()

plugins/modelinspector/CMakeLists.txt

@@ -30,6 +30,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_modelinspector.json
         SOURCES
         ${gammaray_models_srcs}
+        TYPE PROBE
     )
     set_target_properties(gammaray_modelinspector PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
 
@@ -56,6 +57,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_modelinspector.json
         SOURCES
         ${gammaray_models_ui_srcs}
+        TYPE UI
     )
 
     target_link_libraries(gammaray_modelinspector_ui gammaray_ui)

plugins/network/CMakeLists.txt

@@ -32,6 +32,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_network.json
         SOURCES
         ${gammaray_network_srcs}
+        TYPE PROBE
     )
     target_link_libraries(gammaray_network gammaray_core Qt::Network Qt::CorePrivate)
     set_target_properties(gammaray_network PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
@@ -65,6 +66,7 @@ if(GAMMARAY_BUILD_UI)
         gammaray_network.json
         SOURCES
         ${gammaray_network_ui_srcs}
+        TYPE UI
     )
     target_link_libraries(gammaray_network_ui gammaray_ui Qt::Network)
 endif()

plugins/openglsupport/CMakeLists.txt

@@ -16,6 +16,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         SOURCES
         openglsupport.cpp
         openglsupport.h
+        TYPE PROBE
     )
     target_link_libraries(gammaray_openglsupport gammaray_core Qt::Gui)
     if(TARGET Qt6::OpenGL)

plugins/positioning/CMakeLists.txt

@@ -29,6 +29,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_positioning.json
         SOURCES
         ${gammaray_positioning_srcs}
+        TYPE PROBE
     )
     target_link_libraries(gammaray_positioning gammaray_core Qt::Positioning)
     set_target_properties(gammaray_positioning PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
@@ -77,6 +78,7 @@ if(GAMMARAY_BUILD_UI
         gammaray_positioning.json
         SOURCES
         ${gammaray_positioning_ui_srcs}
+        TYPE UI
     )
 
     target_link_libraries(