@@ -45,22 +45,10 @@ if(LEMON_QT6)
45
45
set (LEMON_QT_LIBNAME Qt6)
46
46
set (QT_MAJOR_VERSION 6)
47
47
set (QT_DEFAULT_MAJOR_VERSION 6)
48
- add_definitions (-DLEMON_QT6=1)
49
- #From: https://github.com/KDE/kwin/blob/master/cmake/modules/FindXKB.cmake#L35
50
- find_package (PkgConfig)
51
- pkg_check_modules(PKG_XKB QUIET xkbcommon)
52
- set (XKB_DEFINITIONS ${PKG_XKB_CFLAGS_OTHER} )
53
- find_path (XKB_INCLUDE_DIR NAMES xkbcommon/xkbcommon.h HINTS ${PKG_XKB_INCLUDE_DIRS} )
54
- find_library (XKB_LIBRARY NAMES xkbcommon HINTS ${PKG_XKB_LIBRARY_DIRS} )
55
- add_library (XKB::XKB UNKNOWN IMPORTED )
56
- set_target_properties (XKB::XKB PROPERTIES
57
- IMPORTED_LOCATION "${XKB_LIBRARY} "
58
- INTERFACE_COMPILE_OPTIONS "${XKB_DEFINITIONS} "
59
- INTERFACE_INCLUDE_DIRECTORIES "${XKB_INCLUDE_DIR} "
60
- )
48
+ add_definitions (-DLEMON_QT6)
61
49
else ()
62
50
set (LEMON_QT_MAJOR_VERSION 5)
63
- set (LEMON_QT_MINOR_VERSION 10 )
51
+ set (LEMON_QT_MINOR_VERSION 15 )
64
52
set (LEMON_QT_LIBNAME Qt5)
65
53
set (QT_MAJOR_VERSION 5)
66
54
endif ()
@@ -254,7 +242,7 @@ if(WIN32 AND ENABLE_XLS_EXPORT AND NOT LEMON_QT6)
254
242
add_definitions (-DENABLE_XLS_EXPORT)
255
243
endif ()
256
244
257
- target_link_libraries (lemon ${LEMON_QT_LIBS} lemon-core lemon-base SingleApplication::SingleApplication)
245
+ target_link_libraries (lemon PRIVATE ${LEMON_QT_LIBS} lemon-core lemon-base SingleApplication::SingleApplication)
258
246
259
247
260
248
# ==================================================================================
0 commit comments