From: Alexander Neundorf <neundorf@kde.org>
Date: Thu, 11 May 2006 22:41:28 +0000 (+0000)
Subject: -cleanup the toplevel CMakeLists.txt a bit
X-Git-Tag: v3.80.2~87
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=8bdd0448e6e69ac73e0dc26f9f3c32631e07d1dc;p=libqmvoc.git

-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 bae5461..88b2926 100644
--- 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 5c5eb3f..01a09b0 100644
--- 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 76bf356..c209000 100644
--- 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 26d66b0..bea799f 100644
--- 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 ab5c1bf..ad99852 100644
--- 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 7432eff..e1db90f 100644
--- 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 af602ee..138305d 100644
--- 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 6cb27af..6bfec8b 100644
--- 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 b55494d..7643cb2 100644
--- 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 f26ce5d..6928bb9 100644
--- 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/
 )