don't use QSK_SOURCE_DIR

This commit is contained in:
Rick Vogel 2023-12-04 18:52:41 +01:00 committed by uwerat
parent cbd4fa9bdc
commit b850c18557
5 changed files with 10 additions and 8 deletions

View File

@ -75,6 +75,8 @@ project(QSkinny
HOMEPAGE_URL "https://github.com/uwerat/qskinny" HOMEPAGE_URL "https://github.com/uwerat/qskinny"
VERSION 0.8.0) VERSION 0.8.0)
set(QSK_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
qsk_setup_options() qsk_setup_options()
include(GNUInstallDirs) include(GNUInstallDirs)

View File

@ -19,8 +19,8 @@ if(ENABLE_PINYIN)
qsk_setup_Pinyin() qsk_setup_Pinyin()
list(APPEND SOURCES list(APPEND SOURCES
${CMAKE_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.h ${QSK_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.h
${CMAKE_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.cpp ${QSK_SOURCE_DIR}/src/inputpanel/QskPinyinTextPredictor.cpp
) )
endif() endif()
@ -28,8 +28,8 @@ if(ENABLE_HUNSPELL)
qsk_setup_Hunspell() qsk_setup_Hunspell()
list(APPEND SOURCES list(APPEND SOURCES
${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.h ${QSK_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.h
${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp ${QSK_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp
) )
endif() endif()

View File

@ -499,7 +499,7 @@ if(ENABLE_PINYIN)
target_link_libraries(${target} PRIVATE pinyin Fcitx5::Utils) target_link_libraries(${target} PRIVATE pinyin Fcitx5::Utils)
target_include_directories(${target} target_include_directories(${target}
PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/inputcontext>) PUBLIC $<BUILD_INTERFACE:${QSK_SOURCE_DIR}/inputcontext>)
endif() endif()
set_target_properties(${target} PROPERTIES FOLDER libs) set_target_properties(${target} PROPERTIES FOLDER libs)

View File

@ -31,7 +31,7 @@ target_compile_definitions(${target}
target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
if(ENABLE_ENSURE_SKINS) 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_compile_definitions(${target} PRIVATE ENSURE_SKINS)
target_link_libraries(${target} PRIVATE squiekskin material3skin fluent2skin) target_link_libraries(${target} PRIVATE squiekskin material3skin fluent2skin)
endif() endif()

View File

@ -28,8 +28,8 @@ if(BUILD_SVG2QVG_STANDALONE)
target_include_directories(${target} target_include_directories(${target}
PRIVATE PRIVATE
${CMAKE_SOURCE_DIR}/src/common ${QSK_SOURCE_DIR}/src/common
${CMAKE_SOURCE_DIR}/src/graphic) ${QSK_SOURCE_DIR}/src/graphic)
target_compile_definitions(${target} PRIVATE QSK_STANDALONE) target_compile_definitions(${target} PRIVATE QSK_STANDALONE)
target_link_libraries(${target} PRIVATE Qt::Gui Qt::GuiPrivate) target_link_libraries(${target} PRIVATE Qt::Gui Qt::GuiPrivate)