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

wip

This commit is contained in:
Uwe Rathmann 2023-04-05 17:19:42 +02:00
parent 3a4e9ec9a8
commit d281c67cbc
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QskBuildFunctions.cmake
View File

@ -12,7 +12,7 @@ function(qsk_add_executable target)
endif()
set_target_properties(${target} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
endfunction()
@ -25,7 +25,7 @@ function(qsk_add_library target)
endif()
set_target_properties(${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
endfunction()
@ -63,7 +63,7 @@ function(qsk_add_plugin target TYPE CLASS_NAME)
# otherwise it won't be found at runtime ...
set_target_properties( ${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins/${TYPE}")
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/${TYPE})
install(TARGETS ${target} DESTINATION "plugins/${TYPE}" )
set_target_properties(${target} PROPERTIES

28
cmake/QskFindMacros.cmake
View File

@ -68,31 +68,27 @@ endmacro()
macro(qsk_setup_Hunspell)
find_package(PkgConfig)
pkg_check_modules(PKG_HUNSPELL QUIET hunspell)
find_path(HUNSPELL_INCLUDE_DIRS
NAMES hunspell.hxx
PATH_SUFFIXES hunspell
HINTS ${PKG_HUNSPELL_INCLUDE_DIRS})
find_library(HUNSPELL_LIBRARIES
NAMES ${PKG_HUNSPELL_LIBRARIES} hunspell hunspell-1.8 hunspell-1.7 hunspell-1.6 libhunspell
HINTS ${PKG_HUNSPELL_LIBRARY_DIRS})
pkg_check_modules(hunspell hunspell IMPORTED_TARGET)
set(package_name "PkgConfig::hunspell")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(HUNSPELL
REQUIRED_VARS HUNSPELL_LIBRARIES HUNSPELL_INCLUDE_DIRS
VERSION_VAR PKG_HUNSPELL_VERSION)
if (NOT TARGET "${package_name}")
set(Hunspell_FOUND 0)
return()
endif()
mark_as_advanced(HUNSPELL_INCLUDE_DIRS HUNSPELL_LIBRARIES)
add_library(Hunspell::Hunspell INTERFACE IMPORTED)
target_link_libraries(Hunspell::Hunspell INTERFACE ${package_name})
unset(package_name)
add_library(hunspell SHARED IMPORTED GLOBAL)
set_target_properties(hunspell PROPERTIES IMPORTED_LOCATION ${HUNSPELL_LIBRARIES})
target_include_directories(hunspell INTERFACE ${HUNSPELL_INCLUDE_DIRS})
set(Hunspell_FOUND TRUE)
endmacro()
macro(qsk_setup_Pinyin)
# does this code work ????
find_package(PkgConfig)
pkg_check_modules(PKG_PINYIN QUIET pinyin)

5
examples/CMakeLists.txt
View File

@ -1,3 +1,8 @@
############################################################################
# QSkinny - Copyright (C) 2016 Uwe Rathmann
# This file may be used under the terms of the 3-clause BSD License
############################################################################
add_subdirectory(desktop)
add_subdirectory(gallery)
add_subdirectory(layouts)

2
playground/webview/CMakeLists.txt
View File

@ -5,7 +5,7 @@
qsk_add_example(webview main.cpp)
if (QT_VERSION_MAJOR VERSION_GREATER "5")
if (QT_VERSION_MAJOR VERSION_GREATER 5)
target_link_libraries(webview PRIVATE Qt::WebEngineQuick Qt::WebEngineQuickPrivate)
else()
target_link_libraries(webview PRIVATE Qt::WebEngine Qt::WebEnginePrivate)

2
src/CMakeLists.txt
View File

@ -451,7 +451,7 @@ target_include_directories(${target} PUBLIC
target_link_libraries(${target}
PUBLIC Qt::Core Qt::CorePrivate Qt::Quick Qt::QuickPrivate)
if (QT_VERSION_MAJOR VERSION_GREATER "5")
if (QT_VERSION_MAJOR VERSION_GREATER 5)
target_link_libraries(${target} PUBLIC Qt::OpenGL Qt::OpenGLPrivate)
endif()