-cleanup the toplevel CMakeLists.txt a bit

-remove include_directories( CMAKE_CURRENT_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR)
in the subdirs, since this is done now automatically by cmake (the CMAKE_INCLUDE_CURRENT_DIR option
-include_directories(KDE4_INCLUDES) in the toplevel CMakeLists.txt, so it
doesn't have to be done in every subdir

Alex

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=539883

diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt
index bae54619fb9d994c37c9d25aebee0d36f053a385..88b29268dc76625be60f56996f5aa6c30a5501bd 100644 (file)
--- a/extdate/CMakeLists.txt
+++ b/extdate/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( tests ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+
 
 
 ########### next target ###############

diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt
index 5c5eb3f6b448df6162761b179ee633f85a2d671a..01a09b0f1d71793e383b913ff02249c21eab6eaa 100644 (file)
--- a/extdate/tests/CMakeLists.txt
+++ b/extdate/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 
 
 ########### next target ###############

diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt
index 76bf356cad09c6486704fca17954f43e3175de85..c2090008b7b3de7b0d8eb3fc8c39febb2506b105 100644 (file)
--- a/kdeeducore/CMakeLists.txt
+++ b/kdeeducore/CMakeLists.txt
@@ -1,12 +1,5 @@
 kde4_header()
 
-include_directories(
-   ${KDE4_INCLUDE_DIR}
-   ${QT_INCLUDES}
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 
 ########### next target ###############
 

diff --git a/kdeeducore/tests/CMakeLists.txt b/kdeeducore/tests/CMakeLists.txt
index 26d66b0aa83b2e9708f3d4f1449c2e648fdc7833..bea799fe93217321913515eff9fb4a9683d670e0 100644 (file)
--- a/kdeeducore/tests/CMakeLists.txt
+++ b/kdeeducore/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/kdeeducore ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( ${CMAKE_SOURCE_DIR}/kdeeducore  )
 
 
 ########### next target ###############

diff --git a/kdeeduplot/CMakeLists.txt b/kdeeduplot/CMakeLists.txt
index ab5c1bfd33f512f45ed14d82e44e1a477060d19e..ad99852b50c310c49236d33d7b78bbbfc54a88ac 100644 (file)
--- a/kdeeduplot/CMakeLists.txt
+++ b/kdeeduplot/CMakeLists.txt
@@ -1,12 +1,5 @@
 kde4_header()
 
-include_directories(
-   ${KDE4_INCLUDE_DIR}
-   ${QT_INCLUDES}
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 
 ########### next target ###############
 

diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt
index 7432eff7089611e657908580e722dc5fd5ece74f..e1db90fde51d69bfce9225e29280816b0a55c254 100644 (file)
--- a/kdeeduui/CMakeLists.txt
+++ b/kdeeduui/CMakeLists.txt
@@ -2,13 +2,6 @@ kde4_header()
 
 #add_subdirectory(tests)
 
-include_directories(
-   ${KDE4_INCLUDE_DIR}
-   ${QT_INCLUDES}
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 
 ########### next target ###############
 

diff --git a/kdeeduui/tests/CMakeLists.txt b/kdeeduui/tests/CMakeLists.txt
index af602eec80ac284c77099d6a9069ca0d29388187..138305d0d92bbbc856f22ae8afd4934100906665 100644 (file)
--- a/kdeeduui/tests/CMakeLists.txt
+++ b/kdeeduui/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/kdeeduui ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( ${CMAKE_SOURCE_DIR}/kdeeduui  )
 
 
 ########### install files ###############

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 6cb27afa0a4e03341ddf8489a88caee2499a037a..6bfec8b559ae4a25ba4e4a22d659b148a87f5c88 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -3,13 +3,6 @@ kde4_header()
 add_subdirectory(data)
 add_subdirectory(tests)
 
-include_directories(
-   ${KDE4_INCLUDE_DIR}
-   ${QT_INCLUDES}
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 
 ########### next target ###############
 

diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index b55494df9bb0a0c7cc7db8100408cd29c7d3b6cd..7643cb21ed5df5816d28ff0a3baf4f3190fae64e 100644 (file)
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience  )
 
 
 ########### next target ###############

diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index f26ce5dc8f1d58d558b716a2be74058d4eb2edce..6928bb9fb4d3f14884f6a6f13c74a7a7e905328d 100644 (file)
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -1,10 +1,6 @@
 kde4_header()
 
 include_directories(
-  ${KDE4_INCLUDE_DIR}
-  ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/
   ${CMAKE_SOURCE_DIR}/libkdeedu/extdate/
 )