Forcing static linking for embedded dependencies (#2173)

flameshot-org · Dec 21, 2021 · 1bd8857 · 1bd8857
1 parent 2e2dbdc
commit 1bd8857
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
@@ -303,12 +303,6 @@ jobs:
       fail-fast: false
       matrix:
         dist:
-          - {
-              name: fedora-33,
-              os: fedora,
-              symbol: 33,
-              arch: x86_64
-            }
           - {
               name: fedora-34,
               os: fedora,

diff --git a/external/Qt-Color-Widgets/CMakeLists.txt b/external/Qt-Color-Widgets/CMakeLists.txt
@@ -56,9 +56,6 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 
-option(BUILD_SHARED_LIBS "Build the shared library" ON)
-option(BUILD_STATIC_LIBS "Build the static library" OFF)
-
 set (TARGET_NAME ${COLORWIDGET_PROJECT_NAME})
 option(COLOR_WIDGETS_QT_SUFFIX "Append qt version to the target output files" OFF)
 if ( COLOR_WIDGETS_QT_SUFFIX )
@@ -70,12 +67,10 @@ endif()
 set (INCLUDE_PREFIX "QtColorWidgets")
 set (COLOR_WIDGETS_LIBRARY "${TARGET_NAME}")
 
-if ( ${BUILD_STATIC_LIBS} )
-    add_definitions(-DQTCOLORWIDGETS_STATICALLY_LINKED)
-endif()
+add_definitions(-DQTCOLORWIDGETS_STATICALLY_LINKED)
 
 
-add_library (${TARGET_NAME} "")
+add_library (${TARGET_NAME} STATIC "")
 set_target_properties(${TARGET_NAME}
   PROPERTIES
   EXPORT_NAME "${TARGET_NAME}${TARGET_OUTPUT_SUFFIX}")