kdereview/palapeli

[Stefan Majewsky]

SVN commit 1047685 by majewsky:

Use config mode instead of module mode for find_package(LibPala).

CCMAIL:kde-buildsystem at kde.org


 D             cmake (directory)  
 M  +3 -3      libpala-example/CMakeLists.txt  
 M  +3 -1      libpala/CMakeLists.txt  
 A             libpala/libpala-config.cmake  


--- trunk/kdereview/palapeli/libpala-example/CMakeLists.txt #1047684:1047685
@@ -2,11 +2,11 @@
 find_package(KDE4 REQUIRED)
 find_package(LibPala REQUIRED)
 
-add_definitions(${LIBPALA_DEFINITIONS})
-include_directories(${LIBPALA_INCLUDE_DIRS})
+include(KDE4Defaults)
+include_directories(${KDE4_INCLUDES} ${pala_INCLUDE_DIRS})
 
 kde4_add_plugin(myslicer myslicer.cpp)
-target_link_libraries(myslicer ${LIBPALA_LIBRARIES})
+target_link_libraries(myslicer pala ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS})
 
 install(TARGETS myslicer DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES myslicer.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- trunk/kdereview/palapeli/libpala/CMakeLists.txt #1047684:1047685
@@ -31,7 +31,9 @@
 	DEFINE_SYMBOL MAKE_LIBPALA
 )
 
-install(TARGETS pala ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS pala EXPORT pala-targets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(EXPORT pala-targets DESTINATION ${LIB_INSTALL_DIR}/libpala)
+install(FILES libpala-config.cmake DESTINATION ${LIB_INSTALL_DIR}/libpala)
 install(FILES ${libpala_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/libpala COMPONENT Devel)
 install(FILES ${libpala_FANCY_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/Pala COMPONENT Devel)
 install(FILES libpala-slicerplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})