Author: dmacvicar Date: Wed May 30 16:03:19 2007 New Revision: 5647 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5647&view=rev Log: - 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. Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt trunk/libzypp/tests/CMakeLists.txt trunk/libzypp/tests/cache/CMakeLists.txt trunk/libzypp/tests/media/CMakeLists.txt trunk/libzypp/tests/zypp/CMakeLists.txt trunk/libzypp/tools/cachetools/CMakeLists.txt trunk/libzypp/tools/package-manager/CMakeLists.txt trunk/libzypp/tools/registration/CMakeLists.txt trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp2/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -62,6 +62,14 @@ ) #################################################################### +# 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( 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 # #################################################################### Modified: trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -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 ) Modified: trunk/libzypp/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tests/CMakeLists.txt (original) +++ trunk/libzypp/tests/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -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 ) Modified: trunk/libzypp/tests/cache/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tests/cache/CMakeLists.txt (original) +++ trunk/libzypp/tests/cache/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -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 ) Modified: trunk/libzypp/tests/media/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/media/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tests/media/CMakeLists.txt (original) +++ trunk/libzypp/tests/media/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,5 +1,3 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - ########### next target ############### Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -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 ) Modified: trunk/libzypp/tools/cachetools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/cachetools/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tools/cachetools/CMakeLists.txt (original) +++ trunk/libzypp/tools/cachetools/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,4 +1,3 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) SET( zyppcache_SRC zypp-cache.cc Modified: trunk/libzypp/tools/package-manager/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/package-manager/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tools/package-manager/CMakeLists.txt (original) +++ trunk/libzypp/tools/package-manager/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,4 +1,3 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) ########### install files ############### Modified: trunk/libzypp/tools/registration/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/registration/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/tools/registration/CMakeLists.txt (original) +++ trunk/libzypp/tools/registration/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,5 +1,3 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) - SET( querypool_SRC zypp-query-pool.cc ) Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,10 +1,4 @@ #################################################################### -# INCLUDES # -#################################################################### - -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) - -#################################################################### # SOURCES # #################################################################### Modified: trunk/libzypp/zypp2/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev=5647&r1=5646&r2=5647&view=diff ============================================================================== --- trunk/libzypp/zypp2/CMakeLists.txt (original) +++ trunk/libzypp/zypp2/CMakeLists.txt Wed May 30 16:03:19 2007 @@ -1,10 +1,4 @@ #################################################################### -# INCLUDES # -#################################################################### - -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - -#################################################################### # SOURCES # #################################################################### -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org