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

List:       kde-commits
Subject:    [Phonon/4.1] 3337218: Using ${KDE4_INCLUDE_DIR} in kdelibs files is
From:       David Faure <faure () kde ! org>
Date:       2011-01-02 21:58:47
Message-ID: 20110102215847.39D49A612D () git ! kde ! org
[Download RAW message or body]

commit 33372187f925fb244dfc2cc4482ef62cbf961742
branch 4.1
Author: David Faure <faure@kde.org>
Date:   Fri Mar 24 15:03:39 2006 +0000

    Using ${KDE4_INCLUDE_DIR} in kdelibs files is wrong. The installed kdelibs \
headers should not be used.  This commit also sets CMAKE_INCLUDE_CURRENT_DIR at the \
toplevel and removes many CMAKE_CURRENT_SOURCE_DIR (but not all)  
    Also defined kdelibs-specific macros to specify which includes are wanted in a \
given subdir. For instance macro_use_lib_kparts()  will include kparts and all its \
dependent libs. Of course the reorg coming soon will mean changes to those macros, \
this was mainly  an experiment to see how it would work, plus a way to simplify the \
CMakeLists.txt files already.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9231ee..2fcf243 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
 kde4_header()
 
+# Those apply to all subdirs
+macro_use_lib_kio()
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${QT_INCLUDES} ) +
 add_subdirectory( ifaces ) 
 add_subdirectory( ui ) 
 add_subdirectory( tests ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
 
 ########### next target ###############
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 42c21cf..19d3402 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,8 +1,5 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 ########### next target ###############
 
 set(crossfade_SRCS crossfade.cpp )
diff --git a/ifaces/CMakeLists.txt b/ifaces/CMakeLists.txt
index cf95984..5eb97de 100644
--- a/ifaces/CMakeLists.txt
+++ b/ifaces/CMakeLists.txt
@@ -2,9 +2,6 @@ kde4_header()
 
 add_subdirectory( ui ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 ########### next target ###############
 
 set(phononifaces_LIB_SRCS backend.cpp base.cpp )
diff --git a/ifaces/ui/CMakeLists.txt b/ifaces/ui/CMakeLists.txt
index 657c49a..9801a31 100644
--- a/ifaces/ui/CMakeLists.txt
+++ b/ifaces/ui/CMakeLists.txt
@@ -1,7 +1,5 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
 
 ########### next target ###############
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b87d93..4792166 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,5 @@
 kde4_header()
 add_subdirectory( fakebackend ) 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  )  
 set(mediaobjecttest_SRCS mediaobjecttest.cpp )
 set(audiopathtest_SRCS audiopathtest.cpp )
diff --git a/tests/fakebackend/CMakeLists.txt b/tests/fakebackend/CMakeLists.txt
index 26d222c..3e2a9f8 100644
--- a/tests/fakebackend/CMakeLists.txt
+++ b/tests/fakebackend/CMakeLists.txt
@@ -2,9 +2,6 @@ kde4_header()
 
 add_subdirectory( ui ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 ########### next target ###############
 
 set(phonon_fake_PART_SRCS 
diff --git a/tests/fakebackend/ui/CMakeLists.txt \
b/tests/fakebackend/ui/CMakeLists.txt index fb5d3d3..4a59922 100644
--- a/tests/fakebackend/ui/CMakeLists.txt
+++ b/tests/fakebackend/ui/CMakeLists.txt
@@ -1,8 +1,5 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 ########### next target ###############
 
 set(phonon_fakeui_PART_SRCS videowidget.cpp backend.cpp )
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index d3a5195..c67dd7a 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -2,9 +2,6 @@ kde4_header()
 
 add_subdirectory( tests ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 ########### next target ###############
 
 set(phononui_LIB_SRCS 
diff --git a/ui/tests/CMakeLists.txt b/ui/tests/CMakeLists.txt
index 8b18de4..e84877c 100644
--- a/ui/tests/CMakeLists.txt
+++ b/ui/tests/CMakeLists.txt
@@ -1,8 +1,5 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
 set(seekslider_SRCS seekslider.cpp )
 kde4_automoc(${seekslider_SRCS})
 if(KDE4_BUILD_TESTS)


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