Commit f60d08e0 authored by David Faure's avatar David Faure

Set cmake min req to 2.8.9 to match kdelibs4; fix linking to ktexteditor as a result.

CCMAIL: kde-buildsystem@kde.org
parent 791ed223
cmake_minimum_required(VERSION 2.8.9)
# Kate project # Kate project
project (kate) project (kate)
......
...@@ -33,7 +33,7 @@ set(kateprojectplugin_PART_SRCS ...@@ -33,7 +33,7 @@ set(kateprojectplugin_PART_SRCS
kde4_add_plugin(kateprojectplugin ${kateprojectplugin_PART_SRCS}) kde4_add_plugin(kateprojectplugin ${kateprojectplugin_PART_SRCS})
# Ubuntu 12.10 needs the lower-case qjson # 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 files ###############
install(TARGETS kateprojectplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kateprojectplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
......
...@@ -5,7 +5,7 @@ set(ktexteditor_hlselection_PART_SRCS hlselectionplugin.cpp ) ...@@ -5,7 +5,7 @@ set(ktexteditor_hlselection_PART_SRCS hlselectionplugin.cpp )
kde4_add_plugin(ktexteditor_hlselection ${ktexteditor_hlselection_PART_SRCS}) 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} ) install(TARGETS ktexteditor_hlselection DESTINATION ${PLUGIN_INSTALL_DIR} )
......
...@@ -6,7 +6,7 @@ set(ktexteditor_insertfile_PART_SRCS insertfileplugin.cpp ) ...@@ -6,7 +6,7 @@ set(ktexteditor_insertfile_PART_SRCS insertfileplugin.cpp )
kde4_add_plugin(ktexteditor_insertfile ${ktexteditor_insertfile_PART_SRCS}) 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} ) install(TARGETS ktexteditor_insertfile DESTINATION ${PLUGIN_INSTALL_DIR} )
......
...@@ -34,9 +34,9 @@ if (NOT KDE_NO_DEPRECATED) ...@@ -34,9 +34,9 @@ if (NOT KDE_NO_DEPRECATED)
set (KDE_4_4_LIBS_NEEDED ${KDE4_KUTILS_LIBS}) set (KDE_4_4_LIBS_NEEDED ${KDE4_KUTILS_LIBS})
endif() 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
target_link_libraries(kateinterfaces LINK_INTERFACE_LIBRARIES "${KDE4_KPARTS_LIBS}" ) 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}) set_target_properties(kateinterfaces PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
......
...@@ -231,10 +231,10 @@ kde4_add_ui_files(katepart_PART_SRCS ${katepart_PART_UI} ) ...@@ -231,10 +231,10 @@ kde4_add_ui_files(katepart_PART_SRCS ${katepart_PART_UI} )
kde4_add_library (katepartinterfaces ${LIBRARY_TYPE} ${katepart_PART_SRCS} ) kde4_add_library (katepartinterfaces ${LIBRARY_TYPE} ${katepart_PART_SRCS} )
target_link_libraries ( target_link_libraries (
katepartinterfaces ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} katepartinterfaces
${KDE4_KCMUTILS_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTSCRIPT_LIBRARY} ${KDE_4_4_LIBS_NEEDED} ${KDE4_KNEWSTUFF3_LIBS} 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( set_target_properties(
katepartinterfaces PROPERTIES katepartinterfaces PROPERTIES
......
...@@ -20,7 +20,7 @@ include_directories( ...@@ -20,7 +20,7 @@ include_directories(
${KDE4_KIO_INCLUDES} ${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 # buffer test
kde4_add_unit_test(katetextbuffertest katetextbuffertest.cpp katetextbuffertest.h) kde4_add_unit_test(katetextbuffertest katetextbuffertest.cpp katetextbuffertest.h)
......
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