Author: dmacvicar Date: Fri Aug 1 14:13:09 2008 New Revision: 10718 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10718&view=rev Log: - repo_helix does not belong to sat solver core - adapt deptestomatic compilation to find it in tools/ Added: trunk/sat-solver/tools/repo_helix.c - copied, changed from r10717, trunk/sat-solver/src/repo_helix.c trunk/sat-solver/tools/repo_helix.h - copied, changed from r10717, trunk/sat-solver/src/repo_helix.h Removed: trunk/sat-solver/src/repo_helix.c trunk/sat-solver/src/repo_helix.h Modified: trunk/sat-solver/src/CMakeLists.txt trunk/sat-solver/testsuite/CMakeLists.txt trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/CMakeLists.txt?rev=10718&r1=10717&r2=10718&view=diff ============================================================================== --- trunk/sat-solver/src/CMakeLists.txt (original) +++ trunk/sat-solver/src/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -1,7 +1,7 @@ SET(libsatsolver_SRCS bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c - solver.c solverdebug.c repo_solv.c repo_helix.c evr.c pool.c + solver.c solverdebug.c repo_solv.c evr.c pool.c queue.c repo.c repodata.c util.c policy.c fastlz.c solvable.c) ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) @@ -9,7 +9,7 @@ SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h solverdebug.h - repo.h repodata.h repo_solv.h repo_helix.h util.h + repo.h repodata.h repo_solv.h util.h strpool.h dirpool.h knownid.h) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") Modified: trunk/sat-solver/testsuite/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/CMakeLists.txt?rev=10718&r1=10717&r2=10718&view=diff ============================================================================== --- trunk/sat-solver/testsuite/CMakeLists.txt (original) +++ trunk/sat-solver/testsuite/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -7,8 +7,9 @@ ADD_EXECUTABLE(gimmick ${gimmick_SOURCES}) TARGET_LINK_LIBRARIES(gimmick satsolver) - -SET(deptestomatic_SOURCES deptestomatic.c) +# for repo_helix +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools ) +SET(deptestomatic_SOURCES deptestomatic.c ${CMAKE_SOURCE_DIR}/tools/repo_helix.c ) ADD_EXECUTABLE(deptestomatic ${deptestomatic_SOURCES}) TARGET_LINK_LIBRARIES(deptestomatic satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?rev=10718&r1=10717&r2=10718&view=diff ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -25,7 +25,7 @@ ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} ) TARGET_LINK_LIBRARIES( rpmmd2solv satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -SET(helix2solv_REPOS helix2solv.c repo_write.c common_write.c ) +SET(helix2solv_REPOS helix2solv.c repo_helix.c repo_helix.h repo_write.c common_write.c ) ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} ) TARGET_LINK_LIBRARIES( helix2solv satsolver ${EXPAT_LIBRARY}) Copied: trunk/sat-solver/tools/repo_helix.c (from r10717, trunk/sat-solver/src/repo_helix.c) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.c?p2=trunk/sat-solver/tools/repo_helix.c&p1=trunk/sat-solver/src/repo_helix.c&r1=10717&r2=10718&rev=10718&view=diff ============================================================================== (empty) Copied: trunk/sat-solver/tools/repo_helix.h (from r10717, trunk/sat-solver/src/repo_helix.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.h?p2=trunk/sat-solver/tools/repo_helix.h&p1=trunk/sat-solver/src/repo_helix.h&r1=10717&r2=10718&rev=10718&view=diff ============================================================================== (empty) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org