From 364e940a9a78aed3e82d0e83afd20ef765af9925 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 28 Sep 2023 20:52:56 +0200
Subject: [PATCH] CMake: don't default to SHARED libraries, require explicit
---
CMakeModules/CalamaresAddLibrary.cmake | 4 +++-
src/libcalamaresui/CMakeLists.txt | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeModules/CalamaresAddLibrary.cmake b/CMakeModules/CalamaresAddLibrary.cmake
index bc9b4ba6dd..c7cc0f3299 100644
--- a/CMakeModules/CalamaresAddLibrary.cmake
+++ b/CMakeModules/CalamaresAddLibrary.cmake
@@ -62,8 +62,10 @@ function(calamares_add_library)
add_library(${target} STATIC ${LIBRARY_SOURCES})
elseif(LIBRARY_TARGET_TYPE STREQUAL "MODULE")
add_library(${target} MODULE ${LIBRARY_SOURCES})
- else() # default
+ elseif(LIBRARY_TARGET_TYPE STREQUAL "SHARED")
add_library(${target} SHARED ${LIBRARY_SOURCES})
+ else() # default
+ message(FATAL_ERROR "Invalid library type '${LIBRARY_TARGET_TYPE}'")
endif()
calamares_automoc(${target})
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index a6c31fac41..41305e2498 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -45,6 +45,7 @@ endif()
calamares_add_library(calamaresui
SOURCES ${calamaresui_SOURCES}
+ TARGET_TYPE SHARED
EXPORT_MACRO UIDLLEXPORT_PRO
LINK_LIBRARIES
${qtname}::Svg
--
GitLab