168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using qt versionless approach

This commit is contained in:
Rick Vogel 2022-12-20 14:01:57 +01:00
parent 3414b2b802
commit c194bbaedd
34 changed files with 95 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
CMakeLists.txt
View File

@ -10,29 +10,46 @@ set(CMAKE_CXX_EXTENSIONS OFF)
include(${CMAKE_SOURCE_DIR}/features/qskconfig.cmake) include(${CMAKE_SOURCE_DIR}/features/qskconfig.cmake)
# find either Qt5 or Qt6 requred and optional components find_package(Qt6 COMPONENTS Core QUIET)
if(NOT "${Qt5_DIR}" STREQUAL "") if (NOT Qt6_FOUND)
find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets) find_package(Qt5 5.15 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore) find_package(Qt5 5.15 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
set(Qt Qt${Qt5_VERSION_MAJOR}) message(WARNING "using QSkinny's 'qt_add_executable()'")
set(Qt_VERSION ${Qt5_VERSION}) function(qt_add_executable)
set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR}) add_executable(${ARGV})
set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR}) endfunction(qt_add_executable)
set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH}) message(WARNING "using QSkinny's 'qt_add_library()'")
elseif(NOT "${Qt6_DIR}" STREQUAL "") function(qt_add_library)
string(REPLACE "/lib/cmake/Qt6" "" Qt6_PREFIX_DIR "${Qt6_DIR}") add_library(${ARGV})
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${Qt6_PREFIX_DIR}) endfunction(qt_add_library)
find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) # check optional QuickWidgets Svg Widgets
set(Qt Qt${Qt6_VERSION_MAJOR})
set(Qt_VERSION ${Qt6_VERSION})
set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})
set(Qt_VERSION_PATCH ${Qt6_VERSION_PATCH})
else() else()
message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!") find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick)
endif() endif()
# find either Qt5 or Qt6 requred and optional components
#if(NOT "${Qt5_DIR}" STREQUAL "")
# find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
# find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
# set(Qt Qt${Qt5_VERSION_MAJOR})
# set(Qt_VERSION ${Qt5_VERSION})
# set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
# set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
# set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
#elseif(NOT "${Qt6_DIR}" STREQUAL "")
# string(REPLACE "/lib/cmake/Qt6" "" Qt6_PREFIX_DIR "${Qt6_DIR}")
# set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${Qt6_PREFIX_DIR})
# find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
# find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) # check optional QuickWidgets Svg Widgets
# set(Qt Qt${Qt6_VERSION_MAJOR})
# set(Qt_VERSION ${Qt6_VERSION})
# set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
# set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})
# set(Qt_VERSION_PATCH ${Qt6_VERSION_PATCH})
#else()
# message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
#endif()
# optional package hunspell # optional package hunspell
if(NOT LINUX AND ENABLE_HUNSPELL) if(NOT LINUX AND ENABLE_HUNSPELL)
message(WARNING "Feature 'hunspell' only available for UNIX!") message(WARNING "Feature 'hunspell' only available for UNIX!")

2
examples/boxes/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME boxes) set(TARGET_NAME boxes)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/buttons/CMakeLists.txt
View File

@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME buttons) set(TARGET_NAME buttons)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

2
examples/desktop/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME desktop) set(TARGET_NAME desktop)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/frames/CMakeLists.txt
View File

@ -10,7 +10,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME frames) set(TARGET_NAME frames)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

2
examples/gallery/CMakeLists.txt
View File

@ -49,7 +49,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME gallery) set(TARGET_NAME gallery)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/glabels/CMakeLists.txt
View File

@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME glabels) set(TARGET_NAME glabels)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

6
examples/iotdashboard/CMakeLists.txt
View File

@ -69,7 +69,7 @@ list(APPEND TARGET_RESSOURCES
set(TARGET_NAME iotdashboard) set(TARGET_NAME iotdashboard)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_RESSOURCES}) ${TARGET_RESSOURCES})
@ -87,13 +87,13 @@ if(TARGET Qsk::qskinny)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
Qsk::qskinny Qsk::qskinny
${Qt}::Svg) Qt::Svg)
else() else()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny qskinny
qsktestsupport qsktestsupport
${Qt}::Svg) Qt::Svg)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE

2
examples/layouts/CMakeLists.txt
View File

@ -22,7 +22,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME layouts) set(TARGET_NAME layouts)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/listbox/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME listbox) set(TARGET_NAME listbox)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/messagebox/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME messagebox) set(TARGET_NAME messagebox)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/messageboxQml/CMakeLists.txt
View File

@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME messageboxQml) set(TARGET_NAME messageboxQml)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

2
examples/mycontrols/CMakeLists.txt
View File

@ -11,7 +11,7 @@ list(APPEND TARGET_HEADERS
set(TARGET_NAME mycontrols) set(TARGET_NAME mycontrols)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/qvgviewer/CMakeLists.txt
View File

@ -22,7 +22,7 @@ list(APPEND TARGET_QVGS
set(TARGET_NAME qvgviewer) set(TARGET_NAME qvgviewer)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_RESSOURCES} ${TARGET_RESSOURCES}

2
examples/tabview/CMakeLists.txt
View File

@ -11,7 +11,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME tabview) set(TARGET_NAME tabview)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
examples/thumbnails/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME thumbnails) set(TARGET_NAME thumbnails)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

4
inputcontext/CMakeLists.txt
View File

@ -23,7 +23,7 @@ if(ENABLE_HUNSPELL)
${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp) ${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp)
endif() endif()
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES})
if(ENABLE_PINYIN) if(ENABLE_PINYIN)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
@ -47,7 +47,7 @@ endif()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny qskinny
${Qt}::GuiPrivate) Qt::GuiPrivate)
set_target_properties(${TARGET_NAME} PROPERTIES set_target_properties(${TARGET_NAME} PROPERTIES
AUTOMOC ON) AUTOMOC ON)

8
playground/CMakeLists.txt
View File

@ -7,17 +7,17 @@ add_subdirectory(images)
add_subdirectory(shadows) add_subdirectory(shadows)
if (Qt_VERSION_MAJOR VERSION_EQUAL "6") if (Qt_VERSION_MAJOR VERSION_EQUAL "6")
if(TARGET ${Qt}::WebEngineCore) if(TARGET Qt::WebEngineCore)
if(TARGET ${Qt}::WebEngineQuick) if(TARGET Qt::WebEngineQuick)
add_subdirectory(webview) add_subdirectory(webview)
endif() endif()
endif() endif()
elseif(Qt_VERSION VERSION_EQUAL "5") elseif(Qt_VERSION VERSION_EQUAL "5")
if(TARGET ${Qt}::WebEngine) if(TARGET Qt::WebEngine)
add_subdirectory(webview) add_subdirectory(webview)
endif() endif()
endif() endif()
if(TARGET ${Qt}::QuickWidgets) if(TARGET Qt::QuickWidgets)
add_subdirectory(grids) add_subdirectory(grids)
endif() endif()

2
playground/anchors/CMakeLists.txt
View File

@ -20,7 +20,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME anchors) set(TARGET_NAME anchors)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_RESSOURCES}) ${TARGET_RESSOURCES})

2
playground/dialogbuttons/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
Window.cpp Window.cpp
main.cpp) main.cpp)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

2
playground/dials/CMakeLists.txt
View File

@ -16,7 +16,7 @@ list(APPEND TARGET_RESSOURCES
set(TARGET_NAME dials) set(TARGET_NAME dials)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_RESSOURCES}) ${TARGET_RESSOURCES})

4
playground/grids/CMakeLists.txt
View File

@ -18,7 +18,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME grid) set(TARGET_NAME grid)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS}) ${TARGET_HEADERS})
@ -26,7 +26,7 @@ target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny qskinny
qsktestsupport qsktestsupport
${Qt}::QuickWidgets) Qt::QuickWidgets)
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

2
playground/images/CMakeLists.txt
View File

@ -10,7 +10,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME images) set(TARGET_NAME images)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_RESSOURCES}) ${TARGET_RESSOURCES})

2
playground/inputpanel/CMakeLists.txt
View File

@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME inputpanel) set(TARGET_NAME inputpanel)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES}) ${TARGET_SOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}

2
playground/invoker/CMakeLists.txt
View File

@ -9,7 +9,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME invoker) set(TARGET_NAME invoker)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES} ${TARGET_SOURCES}
${TARGET_HEADERS}) ${TARGET_HEADERS})

2
playground/shadows/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME shadows) set(TARGET_NAME shadows)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_HEADERS} ${TARGET_HEADERS}
${TARGET_SOURCES}) ${TARGET_SOURCES})

10
playground/webview/CMakeLists.txt
View File

@ -4,7 +4,7 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME webview) set(TARGET_NAME webview)
add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
${TARGET_SOURCES}) ${TARGET_SOURCES})
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
@ -15,13 +15,13 @@ target_link_libraries(${TARGET_NAME}
if (Qt_VERSION_MAJOR VERSION_GREATER "5") if (Qt_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
${Qt}::WebEngineQuick Qt::WebEngineQuick
${Qt}::WebEngineQuickPrivate) Qt::WebEngineQuickPrivate)
else() else()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
${Qt}::WebEngine Qt::WebEngine
${Qt}::WebEnginePrivate) Qt::WebEnginePrivate)
endif() endif()
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}

2
qmlexport/CMakeLists.txt
View File

@ -13,7 +13,7 @@ list(APPEND TARGET_SOURCES
QskMainQml.cpp QskMainQml.cpp
QskQml.cpp) QskQml.cpp)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES

4
skins/material3/CMakeLists.txt
View File

@ -15,9 +15,9 @@ list(APPEND TARGET_OTHER_FILES
metadata.json) metadata.json)
if(BUILD_QSKDLL) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
else() else()
add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
endif() endif()
target_link_libraries(${TARGET_NAME} PRIVATE qskinny) target_link_libraries(${TARGET_NAME} PRIVATE qskinny)

4
skins/squiek/CMakeLists.txt
View File

@ -15,9 +15,9 @@ list(APPEND TARGET_OTHER_FILES
metadata.json) metadata.json)
if(BUILD_QSKDLL) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
else() else()
add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
endif() endif()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}

16
src/CMakeLists.txt
View File

@ -379,9 +379,9 @@ endif()
set(TARGET_NAME qskinny) set(TARGET_NAME qskinny)
if(BUILD_QSKDLL) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
else() else()
add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) qt_add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
endif() endif()
if(BUILD_QSKDLL) if(BUILD_QSKDLL)
@ -408,16 +408,16 @@ target_include_directories(${TARGET_NAME}
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PUBLIC PUBLIC
${Qt}::Core Qt::Core
${Qt}::CorePrivate Qt::CorePrivate
${Qt}::Quick Qt::Quick
${Qt}::QuickPrivate) Qt::QuickPrivate)
if (Qt_VERSION_MAJOR VERSION_GREATER "5") if (Qt_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PUBLIC PUBLIC
${Qt}::OpenGL Qt::OpenGL
${Qt}::OpenGLPrivate) Qt::OpenGLPrivate)
endif() endif()
if(ENABLE_HUNSPELL) if(ENABLE_HUNSPELL)

4
support/CMakeLists.txt
View File

@ -14,9 +14,9 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME qsktestsupport) set(TARGET_NAME qsktestsupport)
if (BUILD_QSKDLL) if (BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
else() else()
add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS}) qt_add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS})
endif() endif()
if(ENABLE_FONT_CONFIG) if(ENABLE_FONT_CONFIG)

2
tools/CMakeLists.txt
View File

@ -1,3 +1,3 @@
if(TARGET ${Qt}::Svg) if(TARGET Qt::Svg)
add_subdirectory(svg2qvg) add_subdirectory(svg2qvg)
endif() endif()

10
tools/svg2qvg/CMakeLists.txt
View File

@ -1,7 +1,7 @@
set(TARGET_NAME svg2qvg) set(TARGET_NAME svg2qvg)
set(TARGET_SOURCES main.cpp) set(TARGET_SOURCES main.cpp)
add_executable(${TARGET_NAME} ${TARGET_SOURCES}) qt_add_executable(${TARGET_NAME} ${TARGET_SOURCES})
if(BUILD_SVG2QVG_STANDALONE) if(BUILD_SVG2QVG_STANDALONE)
@ -36,14 +36,14 @@ if(BUILD_SVG2QVG_STANDALONE)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
${Qt}::Gui Qt::Gui
${Qt}::GuiPrivate Qt::GuiPrivate
${Qt}::Svg) Qt::Svg)
else() else()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny qskinny
${Qt}::Svg) Qt::Svg)
endif() endif()
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}