From d025d9676f1ba01e82e37280f458ce271252a288 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Mon, 4 Dec 2023 18:52:41 +0100 Subject: [PATCH] don't use QSK_SOURCE_DIR --- CMakeLists.txt | 2 ++ inputcontext/CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 2 +- support/CMakeLists.txt | 2 +- tools/svg2qvg/CMakeLists.txt | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e45367a2..5517241d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,8 @@ project(QSkinny HOMEPAGE_URL "https://github.com/uwerat/qskinny" VERSION 0.8.0) +set(QSK_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) + qsk_setup_options() include(GNUInstallDirs) diff --git a/inputcontext/CMakeLists.txt b/inputcontext/CMakeLists.txt index 0201a65e0..43a9db6d6 100644 --- a/inputcontext/CMakeLists.txt +++ b/inputcontext/CMakeLists.txt @@ -19,8 +19,8 @@ if(ENABLE_PINYIN) qsk_setup_Pinyin() list(APPEND SOURCES - ${CMAKE_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.h - ${CMAKE_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.cpp + ${QSK_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.h + ${QSK_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.cpp ) endif() @@ -28,8 +28,8 @@ if(ENABLE_HUNSPELL) qsk_setup_Hunspell() list(APPEND SOURCES - ${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.h - ${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp + ${QSK_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.h + ${QSK_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp ) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 59ba35fad..4e3c89281 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -492,7 +492,7 @@ if(ENABLE_PINYIN) target_link_libraries(${target} PRIVATE pinyin Fcitx5::Utils) target_include_directories(${target} - PUBLIC $) + PUBLIC $) endif() set_target_properties(${target} PROPERTIES FOLDER libs) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 4d15724fb..5dc77dd57 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -31,7 +31,7 @@ target_compile_definitions(${target} target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) if(ENABLE_ENSURE_SKINS) - target_include_directories(${target} PRIVATE ${CMAKE_SOURCE_DIR}/skins) + target_include_directories(${target} PRIVATE ${QSK_SOURCE_DIR}/skins) target_compile_definitions(${target} PRIVATE ENSURE_SKINS) target_link_libraries(${target} PRIVATE squiekskin material3skin fluent2skin) endif() diff --git a/tools/svg2qvg/CMakeLists.txt b/tools/svg2qvg/CMakeLists.txt index c206f8204..b468fd447 100644 --- a/tools/svg2qvg/CMakeLists.txt +++ b/tools/svg2qvg/CMakeLists.txt @@ -28,8 +28,8 @@ if(BUILD_SVG2QVG_STANDALONE) target_include_directories(${target} PRIVATE - ${CMAKE_SOURCE_DIR}/src/common - ${CMAKE_SOURCE_DIR}/src/graphic) + ${QSK_SOURCE_DIR}/src/common + ${QSK_SOURCE_DIR}/src/graphic) target_compile_definitions(${target} PRIVATE QSK_STANDALONE) target_link_libraries(${target} PRIVATE Qt::Gui Qt::GuiPrivate)