diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index bf694c0c61..da5ab0d00b 100644 --- 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 index 560b1a4aaa..7308aa981b 100644 --- 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}")