Skip to content

Commit

Permalink
don't use QSK_SOURCE_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
vrcomputing authored and uwerat committed Dec 21, 2023
1 parent cbd4fa9 commit b850c18
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions inputcontext/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ 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()

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()

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ if(ENABLE_PINYIN)
target_link_libraries(${target} PRIVATE pinyin Fcitx5::Utils)

target_include_directories(${target}
PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/inputcontext>)
PUBLIC $<BUILD_INTERFACE:${QSK_SOURCE_DIR}/inputcontext>)
endif()

set_target_properties(${target} PROPERTIES FOLDER libs)
Expand Down
2 changes: 1 addition & 1 deletion support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions tools/svg2qvg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b850c18

Please sign in to comment.