diff --git a/inputcontext/CMakeLists.txt b/inputcontext/CMakeLists.txt index 6dba05bd..2009bd3e 100644 --- a/inputcontext/CMakeLists.txt +++ b/inputcontext/CMakeLists.txt @@ -33,16 +33,17 @@ if(ENABLE_HUNSPELL) ) endif() -qsk_add_plugin(qskinputcontext - platforminputcontexts QskInputContextPlugin ${SOURCES}) +set(target qskinputcontext) + +qsk_add_plugin(${target} platforminputcontexts QskInputContextPlugin ${SOURCES}) if(ENABLE_PINYIN) - target_link_libraries(qskinputcontext PRIVATE pinyin Fcitx5::Utils) + target_link_libraries(${target} PRIVATE pinyin Fcitx5::Utils) endif() if(ENABLE_HUNSPELL) - target_link_libraries(qskinputcontext PRIVATE hunspell) + target_link_libraries(${target} PRIVATE hunspell) endif() -target_compile_definitions(qskinputcontext PRIVATE QSK_INPUTCONTEXT_MAKEDLL) -target_link_libraries(qskinputcontext PRIVATE qskinny Qt::GuiPrivate) +set_target_properties(${target} PROPERTIES DEFINE_SYMBOL QSK_INPUTCONTEXT_MAKEDLL ) +target_link_libraries(${target} PRIVATE qskinny Qt::GuiPrivate) diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt index 60bcee65..607b56a3 100644 --- a/qmlexport/CMakeLists.txt +++ b/qmlexport/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(${target} PRIVATE qskinny) target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) if(BUILD_QSKDLL) - target_compile_definitions(${target} PRIVATE QSK_QML_MAKEDLL) + set_target_properties( ${target} PROPERTIES DEFINE_SYMBOL QSK_QML_MAKEDLL ) endif() install(TARGETS ${target} DESTINATION qmlexport) diff --git a/skins/material3/CMakeLists.txt b/skins/material3/CMakeLists.txt index 238a988e..43c02b7b 100644 --- a/skins/material3/CMakeLists.txt +++ b/skins/material3/CMakeLists.txt @@ -10,4 +10,4 @@ set(SOURCES qt_add_resources(SOURCES icons.qrc) qsk_add_plugin(material3skin skins QskMaterial3SkinFactory ${SOURCES}) -target_compile_definitions(material3skin PRIVATE QSK_MATERIAL3_MAKEDLL) +set_target_properties(material3skin PROPERTIES DEFINE_SYMBOL QSK_MATERIAL3_MAKEDLL ) diff --git a/skins/squiek/CMakeLists.txt b/skins/squiek/CMakeLists.txt index f2c6e72e..28469bff 100644 --- a/skins/squiek/CMakeLists.txt +++ b/skins/squiek/CMakeLists.txt @@ -7,4 +7,4 @@ qsk_add_plugin(squiekskin skins QskSquiekSkinFactory QskSquiekGlobal.h QskSquiekSkin.h QskSquiekSkin.cpp QskSquiekSkinFactory.h QskSquiekSkinFactory.cpp ) -target_compile_definitions(squiekskin PRIVATE QSK_SQUIEK_MAKEDLL) +set_target_properties(squiekskin PROPERTIES DEFINE_SYMBOL QSK_SQUIEK_MAKEDLL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 777f5da3..cb858326 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -431,7 +431,8 @@ else() endif() if(BUILD_QSKDLL) - target_compile_definitions(${target} PUBLIC QSK_DLL PRIVATE QSK_MAKEDLL) + target_compile_definitions(${target} PUBLIC QSK_DLL ) + set_target_properties(${target} PROPERTIES DEFINE_SYMBOL QSK_MAKEDLL) endif() target_include_directories(${target} PUBLIC diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 81fb52ab..a820d803 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -45,7 +45,7 @@ endif() target_link_libraries(${target} PUBLIC qskinny) if (BUILD_QSKDLL) - target_compile_definitions(${target} PRIVATE SKINNY_MAKEDLL) + set_target_properties( ${target} PROPERTIES DEFINE_SYMBOL SKINNY_MAKEDLL ) endif() target_compile_definitions(${target}