Forcing static linking for embedded dependencies (#2173)
This commit is contained in:
6
.github/workflows/Linux-pack.yml
vendored
6
.github/workflows/Linux-pack.yml
vendored
@@ -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,
|
||||
|
||||
9
external/Qt-Color-Widgets/CMakeLists.txt
vendored
9
external/Qt-Color-Widgets/CMakeLists.txt
vendored
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user