Commit 080f6b79 authored by Laurent Montel's avatar Laurent Montel 😁

Fix cmakelists.txt

parent 3ba9f3b1
......@@ -56,7 +56,7 @@ ki18n_wrap_ui(libcomposereditor_ng_SRCS ui/pagecolorbackgroundwidget.ui )
add_library(composereditorng ${LIBRARY_TYPE} ${libcomposereditor_ng_SRCS})
target_link_libraries(composereditorng
${KDE4_KDEWEBKIT_LIBRARY} KF5::WebKit ${QT_QTWEBKIT_LIBRARY} KF5::PimTextEdit ${KDE4_KPRINTUTILS_LIBS} KF5::KDELibs4Support KF5::SonnetCore
KF5::WebKit KF5::WebKit Qt5::WebKitWidgets KF5::PimTextEdit KF5::KDELibs4Support KF5::SonnetCore
)
......
......@@ -8,8 +8,8 @@ set(composerhtmlSources
composerhtmleditor.cpp
)
KDE4_ADD_EXECUTABLE(composerhtmleditor ${composerhtmlSources} )
TARGET_LINK_LIBRARIES(composerhtmleditor ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} composereditorng )
add_executable(composerhtmleditor ${composerhtmlSources} )
TARGET_LINK_LIBRARIES(composerhtmleditor Qt5::WebKitWidgets KF5::KIOCore composereditorng )
install(TARGETS composerhtmleditor ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
......
......@@ -171,7 +171,7 @@ install(FILES kaddressbookui.rc DESTINATION ${DATA_INSTALL_DIR}/kaddressbook)
set(kaddressbook_PART_SRCS kaddressbookpart.cpp)
add_library(kaddressbookpart MODULE ${kaddressbook_PART_SRCS})
target_link_libraries(kaddressbookpart ${KDE4_KPARTS_LIBS} kaddressbookprivate)
target_link_libraries(kaddressbookpart kaddressbookprivate)
install(TARGETS kaddressbookpart DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES data/kaddressbookpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
......
......@@ -7,7 +7,7 @@ macro( kaddressbook_merge _source )
set( _test ${_source} )
get_filename_component( _name ${_source} NAME_WE )
kde4_add_unit_test( ${_name} TESTNAME kaddressbookmerge-${_name} ${_test} )
target_link_libraries( ${_name} kaddressbookprivate ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KABC_LIBS} )
target_link_libraries( ${_name} kaddressbookprivate Qt5::Test KF5::AkonadiCore KF5::Abc )
endmacro()
kaddressbook_merge(mergecontactwidgettest.cpp)
......
......@@ -23,9 +23,9 @@ if(PORT_ME_AWAY_FROM_EVENT_LOOPS)
)
endif()
kde4_add_executable(test_keylistmodels TEST ${test_keylistmodels_SRCS})
add_executable(test_keylistmodels TEST ${test_keylistmodels_SRCS})
target_link_libraries(test_keylistmodels kleo ${KDE4_KDECORE_LIBS})
target_link_libraries(test_keylistmodels kleo )
########### next target ###############
......@@ -41,9 +41,9 @@ if(PORT_ME_AWAY_FROM_EVENT_LOOPS)
)
endif()
kde4_add_executable(test_useridlistmodels TEST ${test_useridlistmodels_SRCS})
add_executable(test_useridlistmodels TEST ${test_useridlistmodels_SRCS})
target_link_libraries(test_useridlistmodels kleo ${KDE4_KDECORE_LIBS})
target_link_libraries(test_useridlistmodels kleo )
endif()
......@@ -58,10 +58,10 @@ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
target_link_libraries(test_verify
kleo
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${KDE4_KDECORE_LIBS}
Qt5::Test
${QGPGME_LIBRARIES}
)
......@@ -78,21 +78,21 @@ if(USABLE_ASSUAN_FOUND)
#FIXME: omitting TEST makes test_uiserver print output again on a Win32 console;
# find a better fix for this issue
if(WIN32)
kde4_add_executable(test_uiserver ${test_uiserver_SRCS})
add_executable(test_uiserver ${test_uiserver_SRCS})
else()
kde4_add_executable(test_uiserver TEST ${test_uiserver_SRCS})
add_executable(test_uiserver TEST ${test_uiserver_SRCS})
endif()
if(ASSUAN2_FOUND)
target_link_libraries(test_uiserver
kleo
${KDE4_KDECORE_LIBS}
${ASSUAN2_LIBRARIES}
)
else()
target_link_libraries(test_uiserver
kleo
${KDE4_KDECORE_LIBS}
${ASSUAN_LIBRARIES}
)
endif()
......
......@@ -15,5 +15,5 @@ target_link_libraries(dbustest KF5::KIOCore KF5::KDELibs4Support)
set( kmail_displaymenu_source displaymessageformatactionmenutest.cpp ../widgets/displaymessageformatactionmenu.cpp )
kde4_add_unit_test( displaymessageformatactionmenutest ${kmail_displaymenu_source})
target_link_libraries( displaymessageformatactionmenutest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} messageviewer)
target_link_libraries( displaymessageformatactionmenutest Qt5::Test messageviewer)
......@@ -16,8 +16,8 @@ macro( add_messagecomposer_test _source )
set( _test ${_source} )
get_filename_component( _name ${_source} NAME_WE )
kde4_add_unit_test( ${_name} TESTNAME messagecomposer-${_name} ${_test} )
target_link_libraries( ${_name} ${KDEPIMLIBS_KMIME_LIBS} messagecomposer messageviewer messagecore templateparser ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
${KDEPIMLIBS_AKONADI_LIBS}
target_link_libraries( ${_name} KF5::Mime messagecomposer messageviewer messagecore templateparser KF5::PimTextEdit Qt5::Test KF5::PimIdentities
KF5::AkonadiCore
)
endmacro()
......@@ -28,17 +28,14 @@ macro( add_messagecomposer_cryptotest _source )
kde4_handle_crypto_rpath_for_executable( ${_name} )
target_link_libraries(
${_name}
${KDEPIMLIBS_KMIME_LIBS}
KF5::Mime
messagecomposer
messageviewer
messagecore
kleo
${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}
${KDEPIMLIBS_AKONADI_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
${KDE4_KDEUI_LIBS}
KF5::PimTextEdit
KF5::AkonadiCore
Qt5::Test
${QGPGME_LIBRARIES}
)
endmacro()
......@@ -72,21 +69,21 @@ add_messagecomposer_cryptotest( signencrypttest.cpp )
set(testkmeditor_SRCS testkmeditor.cpp )
kde4_add_executable(testkmeditor TEST ${testkmeditor_SRCS})
add_executable(testkmeditor TEST ${testkmeditor_SRCS})
target_link_libraries(testkmeditor messagecomposer ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} )
target_link_libraries(testkmeditor messagecomposer KF5::PimTextEdit )
########### next target ###############
set(testkmeditorwin_SRCS testkmeditorwin.cpp )
kde4_add_executable(testkmeditorwin TEST ${testkmeditorwin_SRCS})
add_executable(testkmeditorwin TEST ${testkmeditorwin_SRCS})
target_link_libraries(testkmeditorwin messagecomposer ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} )
target_link_libraries(testkmeditorwin messagecomposer KF5::PimTextEdit )
########### recipientseditor test ###############
set(recipienteditortest_SRCS recipientseditortest.cpp)
kde4_add_executable(recipienteditortest TEST ${recipienteditortest_SRCS})
target_link_libraries(recipienteditortest ${KDE4_KIO_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} messagecomposer kdepim)
add_executable(recipienteditortest TEST ${recipienteditortest_SRCS})
target_link_libraries(recipienteditortest KF5::KIOCore KF5::AkonadiContact messagecomposer kdepim)
......@@ -10,7 +10,7 @@ macro( add_messagecore_test _source )
set( _test ${_source} )
get_filename_component( _name ${_source} NAME_WE )
kde4_add_unit_test( ${_name} TESTNAME messagecore-${_name} ${_test} )
target_link_libraries( ${_name} messagecore ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} kleo )
target_link_libraries( ${_name} messagecore Qt5::Test kleo )
endmacro()
# Attachment tests.
......
project(mail)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
set(mail_SRCS
mailplugin.cpp
folderlist.cpp
......
......@@ -52,10 +52,9 @@ set_target_properties(kdepimmobileui PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SO
target_link_libraries(kdepimmobileui
Qt5::Declarative
${QT_QTOPENGL_LIBRARY}
Qt5::Declarative
Qt5::OpenGL
KF5::AkonadiMime
${KDE4_SOLID_LIBRARY}
akonadi_next
kdepim
calendarsupport
......
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
kde_enable_exceptions()
include_directories(
${CMAKE_SOURCE_DIR}/calendarsupport
......@@ -14,14 +14,14 @@ set(pimprint_calendar_LIB_SRCS
calprintweek.cpp
)
kde4_add_library(pimprint_calendar ${LIBRARY_TYPE} ${pimprint_calendar_LIB_SRCS})
add_library(pimprint_calendar ${LIBRARY_TYPE} ${pimprint_calendar_LIB_SRCS})
target_link_libraries(pimprint_calendar
calendarsupport
${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_KCALCORE_LIBS}
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY}
KF5::AkonadiCore
KF5::CalendarCore
)
set_target_properties(pimprint_calendar PROPERTIES
......
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