[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/akonadi/plugins
From:       David Faure <faure () kde ! org>
Date:       2008-05-27 12:16:51
Message-ID: 1211890611.455417.20122.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 813321 by dfaure:

Use full path to akonadiprotocolinternals, as recommended by cmake authors, otherwise \
it's not found when akonadi is in its own prefix


 M  +1 -1      CMakeLists.txt  
 M  +3 -2      tests/CMakeLists.txt  


--- trunk/KDE/kdepim/akonadi/plugins/CMakeLists.txt #813320:813321
@@ -15,7 +15,7 @@
 
 set(akonadi_serializer_mail_PART_SRCS akonadi_serializer_mail.cpp )
 kde4_add_plugin(akonadi_serializer_mail ${akonadi_serializer_mail_PART_SRCS})
-target_link_libraries(akonadi_serializer_mail ${KDE4_KDECORE_LIBS} \
${KDE4_KMIME_LIBS} ${KDE4_AKONADI_LIBS} akonadiprotocolinternals \
${KDE4_AKONADI_KMIME_LIBS}) +target_link_libraries(akonadi_serializer_mail \
${KDE4_KDECORE_LIBS} ${KDE4_KMIME_LIBS} ${KDE4_AKONADI_LIBS} \
${AKONADI_COMMON_LIBRARIES} ${KDE4_AKONADI_KMIME_LIBS})  install(TARGETS \
akonadi_serializer_mail DESTINATION ${PLUGIN_INSTALL_DIR})  
 set(akonadi_serializer_kcal_SRCS akonadi_serializer_kcal.cpp)
--- trunk/KDE/kdepim/akonadi/plugins/tests/CMakeLists.txt #813320:813321
@@ -5,7 +5,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
     ${CMAKE_CURRENT_SOURCE_DIR}
-        ${Boost_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIR}
+    ${AKONADI_INCLUDE_DIR}
 )
 
 # convenience macro to add akonadi qtestlib unit-tests
@@ -13,7 +14,7 @@
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   kde4_add_unit_test(${_name} TESTNAME akonadiplugin-${_name} ${_test})
-  target_link_libraries(${_name} ${KDE4_AKONADI_LIBS} ${KDE4_AKONADI_KMIME_LIBS} \
${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} akonadiprotocolinternals ${_libs}) +  \
target_link_libraries(${_name} ${KDE4_AKONADI_LIBS} ${KDE4_AKONADI_KMIME_LIBS} \
${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${AKONADI_COMMON_LIBRARIES} \
akonadiprotocolinternals ${_libs})  endmacro(add_akonadiplugin_test)
 
 # qtestlib unit tests


[prev in list] [next in list] [prev in thread] [next in thread]