CMAKE_SOURCE_DIR AND _BINARY_DIR to LIBZYPP_SOURCE_...

so we can build libzypp as a subproject in the future.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f56e1da..4985260 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
-PROJECT(libzypp)
+PROJECT(LIBZYPP)
 SET( PACKAGE "libzypp" )
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+SET( CMAKE_MODULE_PATH ${LIBZYPP_SOURCE_DIR}/cmake/modules )
 cmake_minimum_required(VERSION 2.6)
 
 # allow name libraries by name mixed with full
@@ -11,7 +11,7 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 INCLUDE(ZyppCommon)
-INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
+INCLUDE( ${LIBZYPP_SOURCE_DIR}/VERSION.cmake )
 
 MATH( EXPR LIBZYPP_CURRENT "${LIBZYPP_MAJOR} * 100 + ${LIBZYPP_MINOR}" )
 MATH( EXPR LIBZYPP_AGE     "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" )
@@ -127,12 +127,12 @@ MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}")
 MESSAGE(STATUS "version: ${VERSION}")
 
 MESSAGE(STATUS "Writing pkg-config file...")
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp.pc.cmake ${CMAKE_BINARY_DIR}/libzypp.pc @ONLY)
-INSTALL( FILES ${CMAKE_BINARY_DIR}/libzypp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/libzypp.pc.cmake ${LIBZYPP_BINARY_DIR}/libzypp.pc @ONLY)
+INSTALL( FILES ${LIBZYPP_BINARY_DIR}/libzypp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
 
 MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules")
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
 
 ####################################################################
 # config templates
@@ -140,14 +140,14 @@ INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${
 ####################################################################
 
 MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp")
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp )
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp )
 
 #install systemCheck
 MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp")
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp )
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp )
 
 # logrotate config file
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp-history.lr DESTINATION ${SYSCONFDIR}/logrotate.d )
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp-history.lr DESTINATION ${SYSCONFDIR}/logrotate.d )
 
 ####################################################################
 # SUBDIRECTORIES                                                   #

diff --git a/devel/CMakeLists.txt b/devel/CMakeLists.txt
index 6bdd853..aecaaa8 100644 (file)
--- a/devel/CMakeLists.txt
+++ b/devel/CMakeLists.txt
@@ -1,6 +1,6 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${LIBZYPP_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/devel/genclass.in ${CMAKE_BINARY_DIR}/devel/genclass @ONLY)
+CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/devel/genclass.in ${LIBZYPP_BINARY_DIR}/devel/genclass @ONLY)
 
 ADD_SUBDIRECTORY(devel.dmacvicar)
 ADD_SUBDIRECTORY(devel.ma)

diff --git a/devel/devel.jkupec/CMakeLists.txt b/devel/devel.jkupec/CMakeLists.txt
index 252665d..b326079 100644 (file)
--- a/devel/devel.jkupec/CMakeLists.txt
+++ b/devel/devel.jkupec/CMakeLists.txt
@@ -1,6 +1,6 @@
 ADD_DEFINITIONS(
   -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
-  -DTESTS_SRC_DIR="${CMAKE_SOURCE_DIR}/tests"
+  -DTESTS_SRC_DIR="${LIBZYPP_SOURCE_DIR}/tests"
 )
 
 SET( bridge_SRCS

diff --git a/devel/devel.jsrain/yum/CMakeLists.txt b/devel/devel.jsrain/yum/CMakeLists.txt
index f654ff0..88eb988 100644 (file)
--- a/devel/devel.jsrain/yum/CMakeLists.txt
+++ b/devel/devel.jsrain/yum/CMakeLists.txt
@@ -1,6 +1,6 @@
 ADD_SUBDIRECTORY( YUMParser.test ) 
 
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/zypp/parser/yum ${CMAKE_SOURCE_DIR}/zypp ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum ${LIBZYPP_SOURCE_DIR}/zypp ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
 
 
 ########### install files ###############

diff --git a/doc/autodoc/CMakeLists.txt b/doc/autodoc/CMakeLists.txt
index 60c940c..30ad73d 100644 (file)
--- a/doc/autodoc/CMakeLists.txt
+++ b/doc/autodoc/CMakeLists.txt
@@ -8,9 +8,9 @@ ELSE ( NOT DOT )
    SET( HAVE_DOT YES )
 ENDIF ( NOT DOT )
 
-SET( ZYPP_SOURCE_DIR     ${CMAKE_SOURCE_DIR}/zypp )
-SET( ZYPP_DOCINCLUDE_DIR ${CMAKE_SOURCE_DIR}/doc/autoinclude )
-SET( ZYPP_EXAMPLE_DIR    ${CMAKE_SOURCE_DIR}/examples )
+SET( ZYPP_SOURCE_DIR     ${LIBZYPP_SOURCE_DIR}/zypp )
+SET( ZYPP_DOCINCLUDE_DIR ${LIBZYPP_SOURCE_DIR}/doc/autoinclude )
+SET( ZYPP_EXAMPLE_DIR    ${LIBZYPP_SOURCE_DIR}/examples )
 
 SET( DOXYGEN_INPUT    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile )
 SET( DOXYGEN_OUTPUT   ${CMAKE_CURRENT_BINARY_DIR}/html/index.html )

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 0e787eb..de2f444 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-FILE( GLOB LIBZYPP_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po )
-GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/zypp.pot" ${LIBZYPP_PO_FILES} )
\ No newline at end of file
+FILE( GLOB LIBZYPP_PO_FILES ${LIBZYPP_SOURCE_DIR}/po/*.po )
+GETTEXT_CREATE_TRANSLATIONS( "${LIBZYPP_SOURCE_DIR}/po/zypp.pot" ${LIBZYPP_PO_FILES} )
\ No newline at end of file

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index df3ec1d..6ba335d 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 ADD_SUBDIRECTORY(lib)
 
 ENABLE_TESTING()
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/lib )
+INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/lib )
 
 ADD_DEFINITIONS( -DTESTS_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" -DTESTS_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}" )
 

diff --git a/tests/lib/CMakeLists.txt b/tests/lib/CMakeLists.txt
index 71ec305..e99de9b 100644 (file)
--- a/tests/lib/CMakeLists.txt
+++ b/tests/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/vendor/shttpd )
+INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/vendor/shttpd )
 
 ADD_LIBRARY(zypp_test_utils
  TestSetup.h

diff --git a/tests/repo/CMakeLists.txt b/tests/repo/CMakeLists.txt
index 22aee06..321613a 100644 (file)
--- a/tests/repo/CMakeLists.txt
+++ b/tests/repo/CMakeLists.txt
@@ -2,6 +2,6 @@ ADD_SUBDIRECTORY( yum )
 ADD_SUBDIRECTORY( susetags )
 
 # to find the KeyRingTest receiver
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/zypp )
+INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp )
 
 ADD_TESTS(RepoVariables OutdatedMetadata)

diff --git a/tests/sat/CMakeLists.txt b/tests/sat/CMakeLists.txt
index 52a1760..309ebb9 100644 (file)
--- a/tests/sat/CMakeLists.txt
+++ b/tests/sat/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # to find the KeyRingTest receiver
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tests/zypp )
+INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp )
 
 ADD_TESTS(Solvable SolvParsing WhatProvides LookupAttr)
 

diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt
index 55f5186..1a41adb 100644 (file)
--- a/tests/zypp/CMakeLists.txt
+++ b/tests/zypp/CMakeLists.txt
@@ -1,9 +1,9 @@
 ADD_SUBDIRECTORY(base)
 
 # set the vendor.d paths correctly for the tests
-SET(VENDOR_D "${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/vendors.d")
-FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor")
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/tests/zypp/data/Vendor/zypp2.conf.cmake ${CMAKE_BINARY_DIR}/tests/zypp/data/Vendor/zypp2.conf @ONLY)
+SET(VENDOR_D "${LIBZYPP_SOURCE_DIR}/tests/zypp/data/Vendor/vendors.d")
+FILE(MAKE_DIRECTORY "${LIBZYPP_BINARY_DIR}/tests/zypp/data/Vendor")
+CONFIGURE_FILE(${LIBZYPP_SOURCE_DIR}/tests/zypp/data/Vendor/zypp2.conf.cmake ${LIBZYPP_BINARY_DIR}/tests/zypp/data/Vendor/zypp2.conf @ONLY)
 
 ADD_TESTS(
   Arch

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 05dd75b..0eb5266 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -876,5 +876,5 @@ TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )
 INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
 # install XML schemas
-FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
+FILE( GLOB YUM_SCHEMA_FILES ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
 INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" )