Port away from deprecated LINK_PUBLIC/LINK_PRIVATE

GIT_SILENT
parent 639170b0
...@@ -99,7 +99,7 @@ PRIVATE ...@@ -99,7 +99,7 @@ PRIVATE
) )
if (HAVE_DLFCN) if (HAVE_DLFCN)
target_link_libraries(KDevClangPrivate LINK_PRIVATE ${CMAKE_DL_LIBS}) target_link_libraries(KDevClangPrivate PRIVATE ${CMAKE_DL_LIBS})
endif() endif()
install(DIRECTORY duchain/wrappedQtHeaders DESTINATION ${KDE_INSTALL_DATADIR}/kdevclangsupport install(DIRECTORY duchain/wrappedQtHeaders DESTINATION ${KDE_INSTALL_DATADIR}/kdevclangsupport
......
...@@ -35,20 +35,23 @@ ki18n_wrap_ui(kdevdefinesandincludesmanager_SRCS ...@@ -35,20 +35,23 @@ ki18n_wrap_ui(kdevdefinesandincludesmanager_SRCS
kconfig_add_kcfg_files( kdevdefinesandincludesmanager_SRCS kcm_widget/customdefinesandincludes.kcfgc) kconfig_add_kcfg_files( kdevdefinesandincludesmanager_SRCS kcm_widget/customdefinesandincludes.kcfgc)
kdevplatform_add_plugin(kdevdefinesandincludesmanager JSON kdevdefinesandincludesmanager.json SOURCES ${kdevdefinesandincludesmanager_SRCS}) kdevplatform_add_plugin(kdevdefinesandincludesmanager JSON kdevdefinesandincludesmanager.json SOURCES ${kdevdefinesandincludesmanager_SRCS})
target_link_libraries( kdevdefinesandincludesmanager LINK_PRIVATE target_link_libraries( kdevdefinesandincludesmanager
PRIVATE
kdevnoprojectincludesanddefines
kdevcompilerprovider
KDev::Project KDev::Project
KDev::Util KDev::Util
KDev::Language KDev::Language
kdevnoprojectincludesanddefines )
kdevcompilerprovider)
option(BUILD_kdev_includepathsconverter "Build utility to modify include paths of a project from command line." ON) option(BUILD_kdev_includepathsconverter "Build utility to modify include paths of a project from command line." ON)
if(BUILD_kdev_includepathsconverter) if(BUILD_kdev_includepathsconverter)
add_executable(kdev_includepathsconverter includepathsconverter.cpp) add_executable(kdev_includepathsconverter includepathsconverter.cpp)
ecm_mark_nongui_executable(kdev_includepathsconverter) ecm_mark_nongui_executable(kdev_includepathsconverter)
target_link_libraries(kdev_includepathsconverter LINK_PRIVATE target_link_libraries(kdev_includepathsconverter
KDev::Project PRIVATE
kdevcompilerprovider kdevcompilerprovider
KDev::Project
) )
install(TARGETS kdev_includepathsconverter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kdev_includepathsconverter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
endif() endif()
......
...@@ -18,10 +18,12 @@ ki18n_wrap_ui(compilerprovider_SRCS ...@@ -18,10 +18,12 @@ ki18n_wrap_ui(compilerprovider_SRCS
add_library(kdevcompilerprovider STATIC add_library(kdevcompilerprovider STATIC
${compilerprovider_SRCS}) ${compilerprovider_SRCS})
target_link_libraries( kdevcompilerprovider LINK_PRIVATE target_link_libraries(kdevcompilerprovider
PRIVATE
KDev::Project KDev::Project
KDev::Util KDev::Util
KDev::Language ) KDev::Language
)
set_target_properties(kdevcompilerprovider PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(kdevcompilerprovider PROPERTIES POSITION_INDEPENDENT_CODE ON)
option(BUILD_kdev_msvcdefinehelper "Build the msvcdefinehelper tool for retrieving msvc standard macro definitions" OFF) option(BUILD_kdev_msvcdefinehelper "Build the msvcdefinehelper tool for retrieving msvc standard macro definitions" OFF)
......
...@@ -11,7 +11,7 @@ add_library(kdevnoprojectincludesanddefines STATIC ...@@ -11,7 +11,7 @@ add_library(kdevnoprojectincludesanddefines STATIC
) )
target_link_libraries( kdevnoprojectincludesanddefines target_link_libraries( kdevnoprojectincludesanddefines
LINK_PRIVATE PRIVATE
KDev::Util KDev::Util
KDev::Language KDev::Language
) )
......
...@@ -30,9 +30,9 @@ endif() ...@@ -30,9 +30,9 @@ endif()
add_library(kdevqmakeparser STATIC ${kdevqmakeparser_SRCS} ${parser_GEN_SRCS}) add_library(kdevqmakeparser STATIC ${kdevqmakeparser_SRCS} ${parser_GEN_SRCS})
generate_export_header(kdevqmakeparser BASE_NAME parser EXPORT_MACRO_NAME KDEVQMAKEPARSER_EXPORT) generate_export_header(kdevqmakeparser BASE_NAME parser EXPORT_MACRO_NAME KDEVQMAKEPARSER_EXPORT)
target_link_libraries(kdevqmakeparser target_link_libraries(kdevqmakeparser
LINK_PUBLIC PUBLIC
KDev::Util KDev::Util
LINK_PRIVATE PRIVATE
KF5::CoreAddons KF5::CoreAddons
KF5::KIOCore KF5::KIOCore
) )
......
...@@ -56,7 +56,7 @@ add_library(kdevqtc-qmlsupport STATIC ...@@ -56,7 +56,7 @@ add_library(kdevqtc-qmlsupport STATIC
if (APPLE) if (APPLE)
target_sources(kdevqtc-qmlsupport PRIVATE utils/fileutils_mac.mm) target_sources(kdevqtc-qmlsupport PRIVATE utils/fileutils_mac.mm)
target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE "-framework Foundation" ) target_link_libraries(kdevqtc-qmlsupport PRIVATE "-framework Foundation" )
endif() endif()
# silence warnings which won't be fixed in this 3rd-party code copy, to keep diff small # silence warnings which won't be fixed in this 3rd-party code copy, to keep diff small
...@@ -82,9 +82,8 @@ target_include_directories(kdevqtc-qmlsupport SYSTEM PUBLIC ${CMAKE_CURRENT_SOUR ...@@ -82,9 +82,8 @@ target_include_directories(kdevqtc-qmlsupport SYSTEM PUBLIC ${CMAKE_CURRENT_SOUR
# optional.hpp needs -fexceptions # optional.hpp needs -fexceptions
# (otherwise: plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/optional.hpp:561:94: error: exception handling disabled, use -fexceptions to enable) # (otherwise: plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/optional.hpp:561:94: error: exception handling disabled, use -fexceptions to enable)
kde_target_enable_exceptions(kdevqtc-qmlsupport PRIVATE) kde_target_enable_exceptions(kdevqtc-qmlsupport PRIVATE)
target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE target_link_libraries(kdevqtc-qmlsupport
Qt5::Core PRIVATE
Qt5::Gui
Qt5::Widgets Qt5::Widgets
Qt5::Network Qt5::Network
Qt5::Xml Qt5::Xml
......
...@@ -14,12 +14,13 @@ add_library(kdevqmljscompletion STATIC ${completion_SRCS}) ...@@ -14,12 +14,13 @@ add_library(kdevqmljscompletion STATIC ${completion_SRCS})
generate_export_header(kdevqmljscompletion EXPORT_MACRO_NAME KDEVQMLJSCOMPLETION_EXPORT generate_export_header(kdevqmljscompletion EXPORT_MACRO_NAME KDEVQMLJSCOMPLETION_EXPORT
EXPORT_FILE_NAME codecompletionexport.h) EXPORT_FILE_NAME codecompletionexport.h)
target_link_libraries(kdevqmljscompletion LINK_PRIVATE target_link_libraries(kdevqmljscompletion
PRIVATE
kdevqmljsduchain
kdevqtc-qmlsupport
KDev::Language KDev::Language
KDev::Interfaces KDev::Interfaces
KDev::Project KDev::Project
kdevqmljsduchain
kdevqtc-qmlsupport
) )
if(BUILD_TESTING) if(BUILD_TESTING)
......
...@@ -27,14 +27,13 @@ add_library(kdevqmljsduchain STATIC ...@@ -27,14 +27,13 @@ add_library(kdevqmljsduchain STATIC
generate_export_header(kdevqmljsduchain EXPORT_MACRO_NAME KDEVQMLJSDUCHAIN_EXPORT generate_export_header(kdevqmljsduchain EXPORT_MACRO_NAME KDEVQMLJSDUCHAIN_EXPORT
EXPORT_FILE_NAME duchainexport.h) EXPORT_FILE_NAME duchainexport.h)
target_link_libraries(kdevqmljsduchain target_link_libraries(kdevqmljsduchain
LINK_PRIVATE PUBLIC
Qt5::Core kdevqtc-qmlsupport
KF5::I18n
LINK_PUBLIC
KDev::Language KDev::Language
KDev::Util KDev::Util
KDev::Project KDev::Project
kdevqtc-qmlsupport PRIVATE
KF5::I18n
) )
if(BUILD_TESTING) if(BUILD_TESTING)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment