Git commit f60d08e0d27db18d5868f18af894af367032f058 by David Faure. Committed on 26/07/2015 at 10:42. Pushed by dfaure into branch 'KDE/4.14'.
Set cmake min req to 2.8.9 to match kdelibs4; fix linking to ktexteditor as a result. CCMAIL: [email protected] M +1 -0 CMakeLists.txt M +1 -1 addons/kate/project/CMakeLists.txt M +1 -1 addons/ktexteditor/hlselection/CMakeLists.txt M +1 -1 addons/ktexteditor/insertfile/CMakeLists.txt M +3 -3 kate/app/CMakeLists.txt M +3 -3 part/CMakeLists.txt M +1 -1 tests/CMakeLists.txt http://commits.kde.org/kate/f60d08e0d27db18d5868f18af894af367032f058 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3072aee..d383b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 2.8.9) # Kate project project (kate) diff --git a/addons/kate/project/CMakeLists.txt b/addons/kate/project/CMakeLists.txt index 93c5ffa..d614683 100644 --- a/addons/kate/project/CMakeLists.txt +++ b/addons/kate/project/CMakeLists.txt @@ -33,7 +33,7 @@ set(kateprojectplugin_PART_SRCS kde4_add_plugin(kateprojectplugin ${kateprojectplugin_PART_SRCS}) # Ubuntu 12.10 needs the lower-case qjson -target_link_libraries(kateprojectplugin ${KDE4_KDEUI_LIBS} ${QJSON_LIBRARIES} ${qjson_LIBRARIES} kateinterfaces ktexteditor) +target_link_libraries(kateprojectplugin ${KDE4_KDEUI_LIBS} ${QJSON_LIBRARIES} ${qjson_LIBRARIES} kateinterfaces ${KDE4_KTEXTEDITOR_LIBS}) ########### install files ############### install(TARGETS kateprojectplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/addons/ktexteditor/hlselection/CMakeLists.txt b/addons/ktexteditor/hlselection/CMakeLists.txt index 58e85ae..b7bc4ef 100644 --- a/addons/ktexteditor/hlselection/CMakeLists.txt +++ b/addons/ktexteditor/hlselection/CMakeLists.txt @@ -5,7 +5,7 @@ set(ktexteditor_hlselection_PART_SRCS hlselectionplugin.cpp ) kde4_add_plugin(ktexteditor_hlselection ${ktexteditor_hlselection_PART_SRCS}) -target_link_libraries(ktexteditor_hlselection ${KDE4_KIO_LIBS} ktexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS}) +target_link_libraries(ktexteditor_hlselection ${KDE4_KIO_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS}) install(TARGETS ktexteditor_hlselection DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/addons/ktexteditor/insertfile/CMakeLists.txt b/addons/ktexteditor/insertfile/CMakeLists.txt index ca00ff0..30b4174 100644 --- a/addons/ktexteditor/insertfile/CMakeLists.txt +++ b/addons/ktexteditor/insertfile/CMakeLists.txt @@ -6,7 +6,7 @@ set(ktexteditor_insertfile_PART_SRCS insertfileplugin.cpp ) kde4_add_plugin(ktexteditor_insertfile ${ktexteditor_insertfile_PART_SRCS}) -target_link_libraries(ktexteditor_insertfile ${KDE4_KIO_LIBS} ktexteditor kdeui kfile) +target_link_libraries(ktexteditor_insertfile ${KDE4_KIO_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) install(TARGETS ktexteditor_insertfile DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt index f39bf68..a908300 100644 --- a/kate/app/CMakeLists.txt +++ b/kate/app/CMakeLists.txt @@ -34,9 +34,9 @@ if (NOT KDE_NO_DEPRECATED) set (KDE_4_4_LIBS_NEEDED ${KDE4_KUTILS_LIBS}) endif() -target_link_libraries(kateinterfaces ${KDE_4_4_LIBS_NEEDED} ${QT_QTXML_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KPARTS_LIBS} ${KACTIVITIES_LIBRARY} ) -target_link_libraries(kateinterfaces LINK_INTERFACE_LIBRARIES "${KDE4_KPARTS_LIBS}" ) - +target_link_libraries(kateinterfaces + LINK_PUBLIC ${KDE4_KPARTS_LIBS} + LINK_PRIVATE ${KDE_4_4_LIBS_NEEDED} ${QT_QTXML_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KPARTS_LIBS} ${KACTIVITIES_LIBRARY} ) set_target_properties(kateinterfaces PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) diff --git a/part/CMakeLists.txt b/part/CMakeLists.txt index dcfcd5a..18082f5 100644 --- a/part/CMakeLists.txt +++ b/part/CMakeLists.txt @@ -231,10 +231,10 @@ kde4_add_ui_files(katepart_PART_SRCS ${katepart_PART_UI} ) kde4_add_library (katepartinterfaces ${LIBRARY_TYPE} ${katepart_PART_SRCS} ) target_link_libraries ( - katepartinterfaces ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} - ${KDE4_KCMUTILS_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTSCRIPT_LIBRARY} ${KDE_4_4_LIBS_NEEDED} ${KDE4_KNEWSTUFF3_LIBS} + katepartinterfaces + LINK_PUBLIC ${KDE4_KPARTS_LIBS} + LINK_PRIVATE ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KCMUTILS_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTSCRIPT_LIBRARY} ${KDE_4_4_LIBS_NEEDED} ${KDE4_KNEWSTUFF3_LIBS} ) -target_link_libraries(katepartinterfaces LINK_INTERFACE_LIBRARIES "${KDE4_KPARTS_LIBS}" ) set_target_properties( katepartinterfaces PROPERTIES diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 43e7339..ed52fad 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( ${KDE4_KIO_INCLUDES} ) -set (KATE_TEST_LINK_LIBS ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${KDE_4_4_LIBS_NEEDED} ktexteditor katepartinterfaces) +set (KATE_TEST_LINK_LIBS ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${KDE_4_4_LIBS_NEEDED} ${KDE4_KTEXTEDITOR_LIBS} katepartinterfaces) # buffer test kde4_add_unit_test(katetextbuffertest katetextbuffertest.cpp katetextbuffertest.h) _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
