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

List:       kde-commits
Subject:    KDE/kdeedu
From:       Jeremy Paul Whiting <jpwhiting () kde ! org>
Date:       2011-02-10 4:29:41
Message-ID: 20110210042941.64AB4AC8C3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1219675 by whiting:

make klettres, kgeography, kwordquiz and kturtle build standalone, thanks to Niko \
Sams for the patch

 M  +5 -0      kgeography/CMakeLists.txt  
 M  +5 -0      klettres/CMakeLists.txt  
 M  +5 -0      kturtle/CMakeLists.txt  
 M  +8 -0      kwordquiz/CMakeLists.txt  
 M  +2 -2      kwordquiz/src/CMakeLists.txt  


--- trunk/KDE/kdeedu/kgeography/CMakeLists.txt #1219674:1219675
@@ -1,5 +1,10 @@
 project(kgeography)
 
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${QT4_INCLUDES}) +
 add_subdirectory( doc )
 add_subdirectory( src ) 
 add_subdirectory( data ) 
--- trunk/KDE/kdeedu/klettres/CMakeLists.txt #1219674:1219675
@@ -1,5 +1,10 @@
 project(klettres)
 
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${QT4_INCLUDES}) +
 add_subdirectory( doc )
 add_subdirectory( src )
 
--- trunk/KDE/kdeedu/kturtle/CMakeLists.txt #1219674:1219675
@@ -1,5 +1,10 @@
 project (kturtle)
 
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${QT4_INCLUDES}) +
 add_subdirectory (doc)
 add_subdirectory (src)
 add_subdirectory (icons)
--- trunk/KDE/kdeedu/kwordquiz/CMakeLists.txt #1219674:1219675
@@ -1,5 +1,13 @@
 project(kwordquiz)
 
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${kwordquiz_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
 add_subdirectory( doc )
 add_subdirectory( src ) 
 
--- trunk/KDE/kdeedu/kwordquiz/src/CMakeLists.txt #1219674:1219675
@@ -3,7 +3,7 @@
 add_subdirectory( icons ) # global icons
 add_subdirectory( examples )
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
 
 
 ########### next target ###############
@@ -65,7 +65,7 @@
 
 kde4_add_executable(kwordquiz ${kwordquiz_SRCS})
 
-target_link_libraries(kwordquiz  keduvocdocument ${KDE4_KIO_LIBS} \
${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KPRINTUTILS_LIBS} \
${KDE4_PHONON_LIBRARY}) +target_link_libraries(kwordquiz  \
${LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} \
${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${KDE4_PHONON_LIBRARY})  
 install(TARGETS kwordquiz  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 


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