From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Wed, 30 May 2007 14:03:19 +0000 (+0000)
Subject: - Fix long standing bug where the .cc dependencies were incorrectly
X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~686
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibzypp.git;a=commitdiff_plain;h=a08602cc825937a3022c9912af538fcc555f63ff

- Fix long standing bug where the .cc dependencies were incorrectly
  generated so they ended depending on the installed libzypp headers
  instead of the sources ones. Causing libzypp not to rebuild when
  you touch headers locally.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77df795..f83bcd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,14 @@ SET( DOC_INSTALL_DIR
 )
 
 ####################################################################
+# INCLUDES                                                         #
+####################################################################
+
+#SET (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} SYSTEM )
+
+####################################################################
+
 
 FIND_PACKAGE(Rpm REQUIRED)
 IF ( NOT RPM_FOUND)
@@ -180,13 +188,6 @@ ADD_SUBDIRECTORY( doc EXCLUDE_FROM_ALL )
 ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL )
 
 ####################################################################
-# INCLUDES                                                         #
-####################################################################
-
-SET (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} SYSTEM )
-
-####################################################################
 # OTHERS                                                           #
 ####################################################################
 
diff --git a/devel/devel.dmacvicar/CMakeLists.txt b/devel/devel.dmacvicar/CMakeLists.txt
index 19409f0..99c4c8c 100644
--- a/devel/devel.dmacvicar/CMakeLists.txt
+++ b/devel/devel.dmacvicar/CMakeLists.txt
@@ -1,8 +1,5 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
 ADD_DEFINITIONS(-DSRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\")
 
-
 ADD_EXECUTABLE(mediaaccess mediaaccess.cc)
 TARGET_LINK_LIBRARIES(mediaaccess  zypp )
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2143a1f..a3f91d6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,5 @@
 ENABLE_TESTING()
 
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 ADD_DEFINITIONS( -DTESTS_SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" )
 
 ADD_SUBDIRECTORY( cache )
diff --git a/tests/cache/CMakeLists.txt b/tests/cache/CMakeLists.txt
index 6dbd47d..9948f4f 100644
--- a/tests/cache/CMakeLists.txt
+++ b/tests/cache/CMakeLists.txt
@@ -1,5 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
 ADD_EXECUTABLE(CacheInitializer CacheInitializer_test.cc)
 TARGET_LINK_LIBRARIES(CacheInitializer boost_unit_test_framework )
 TARGET_LINK_LIBRARIES(CacheInitializer zypp2 )
diff --git a/tests/media/CMakeLists.txt b/tests/media/CMakeLists.txt
index 735e582..937274d 100644
--- a/tests/media/CMakeLists.txt
+++ b/tests/media/CMakeLists.txt
@@ -1,5 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
 
 ########### next target ###############
 
diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt
index bc2557c..b15edba 100644
--- a/tests/zypp/CMakeLists.txt
+++ b/tests/zypp/CMakeLists.txt
@@ -1,5 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
 ADD_EXECUTABLE(Arch Arch.cc)
 TARGET_LINK_LIBRARIES(Arch zypp boost_unit_test_framework )
 
diff --git a/tools/cachetools/CMakeLists.txt b/tools/cachetools/CMakeLists.txt
index b7a557e..1407164 100644
--- a/tools/cachetools/CMakeLists.txt
+++ b/tools/cachetools/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 SET( zyppcache_SRC
 zypp-cache.cc
diff --git a/tools/package-manager/CMakeLists.txt b/tools/package-manager/CMakeLists.txt
index 6526845..cbae3a7 100644
--- a/tools/package-manager/CMakeLists.txt
+++ b/tools/package-manager/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 ########### install files ###############
 
diff --git a/tools/registration/CMakeLists.txt b/tools/registration/CMakeLists.txt
index e35e99b..5d4186c 100644
--- a/tools/registration/CMakeLists.txt
+++ b/tools/registration/CMakeLists.txt
@@ -1,5 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
 SET( querypool_SRC
 zypp-query-pool.cc
 )
diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 6080b5d..eee3a56 100644
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -1,10 +1,4 @@
 ####################################################################
-# INCLUDES                                                         #
-####################################################################
-
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
-####################################################################
 # SOURCES                                                          #
 ####################################################################
 
diff --git a/zypp2/CMakeLists.txt b/zypp2/CMakeLists.txt
index 4d6e53a..709e471 100644
--- a/zypp2/CMakeLists.txt
+++ b/zypp2/CMakeLists.txt
@@ -1,10 +1,4 @@
 ####################################################################
-# INCLUDES                                                         #
-####################################################################
-
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-####################################################################
 # SOURCES                                                          #
 ####################################################################