Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11571 - in /trunk/libzypp: ./ devel/ devel/devel.jkupec/ devel/devel.jsrain/yum/ doc/autodoc/ po/ tests/ tests/lib/ tests/repo/ tests/sat/ tests/zypp/ zypp/
  • From: dmacvicar@xxxxxxxxxxxxxxxx
  • Date: Tue, 04 Nov 2008 15:10:57 -0000
  • Message-id: <20081104151057.6BEB42E99F@xxxxxxxxxxxxxxxx>
Author: dmacvicar
Date: Tue Nov 4 16:10:56 2008
New Revision: 11571

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11571&view=rev
Log:
CMAKE_SOURCE_DIR AND _BINARY_DIR to LIBZYPP_SOURCE_...
so we can build libzypp as a subproject in the future.

Modified:
trunk/libzypp/CMakeLists.txt
trunk/libzypp/devel/CMakeLists.txt
trunk/libzypp/devel/devel.jkupec/CMakeLists.txt
trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt
trunk/libzypp/doc/autodoc/CMakeLists.txt
trunk/libzypp/po/CMakeLists.txt
trunk/libzypp/tests/CMakeLists.txt
trunk/libzypp/tests/lib/CMakeLists.txt
trunk/libzypp/tests/repo/CMakeLists.txt
trunk/libzypp/tests/sat/CMakeLists.txt
trunk/libzypp/tests/zypp/CMakeLists.txt
trunk/libzypp/zypp/CMakeLists.txt

Modified: trunk/libzypp/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/CMakeLists.txt (original)
+++ trunk/libzypp/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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 @@
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 "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 @@
####################################################################

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 #

Modified: trunk/libzypp/devel/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/devel/CMakeLists.txt (original)
+++ trunk/libzypp/devel/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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)

Modified: trunk/libzypp/devel/devel.jkupec/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.jkupec/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.jkupec/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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

Modified: trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.jsrain/yum/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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 ###############

Modified: trunk/libzypp/doc/autodoc/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/autodoc/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/doc/autodoc/CMakeLists.txt (original)
+++ trunk/libzypp/doc/autodoc/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -8,9 +8,9 @@
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 )

Modified: trunk/libzypp/po/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/po/CMakeLists.txt (original)
+++ trunk/libzypp/po/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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

Modified: trunk/libzypp/tests/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/tests/CMakeLists.txt (original)
+++ trunk/libzypp/tests/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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}" )


Modified: trunk/libzypp/tests/lib/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/lib/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/tests/lib/CMakeLists.txt (original)
+++ trunk/libzypp/tests/lib/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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

Modified: trunk/libzypp/tests/repo/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/tests/repo/CMakeLists.txt (original)
+++ trunk/libzypp/tests/repo/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -2,6 +2,6 @@
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)

Modified: trunk/libzypp/tests/sat/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/sat/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/tests/sat/CMakeLists.txt (original)
+++ trunk/libzypp/tests/sat/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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)


Modified: trunk/libzypp/tests/zypp/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/tests/zypp/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -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

Modified: trunk/libzypp/zypp/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=11571&r1=11570&r2=11571&view=diff
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Tue Nov 4 16:10:56 2008
@@ -876,5 +876,5 @@
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" )

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages