Author: dmacvicar Date: Tue Nov 4 16:10:59 2008 New Revision: 11572 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11572&view=rev Log: also allow the tree as a subproject. some cmake 2.6 cleanups Modified: trunk/zypper/CMakeLists.txt trunk/zypper/po/CMakeLists.txt trunk/zypper/src/CMakeLists.txt Modified: trunk/zypper/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/CMakeLists.txt?rev=11572&r1=11571&r2=11572&view=diff ============================================================================== --- trunk/zypper/CMakeLists.txt (original) +++ trunk/zypper/CMakeLists.txt Tue Nov 4 16:10:59 2008 @@ -1,19 +1,20 @@ -PROJECT( zypper C CXX ) -SET( PACKAGE zypper ) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT( ZYPPER C CXX ) +SET( PACKAGE "zypper" ) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked SET( CMAKE_MODULE_PATH ${ZYPP_PREFIX}/share/cmake/Modules - ${CMAKE_SOURCE_DIR}/cmake/modules + ${ZYPPER_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) INCLUDE(ZyppCommon) # VERSION -INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) +INCLUDE( ${ZYPPER_SOURCE_DIR}/VERSION.cmake ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 ) -ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) +ADD_DEFINITIONS( -DVERSION="${VERSION}" ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -fstack-protector" ) Modified: trunk/zypper/po/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/CMakeLists.txt?rev=11572&r1=11571&r2=11572&view=diff ============================================================================== --- trunk/zypper/po/CMakeLists.txt (original) +++ trunk/zypper/po/CMakeLists.txt Tue Nov 4 16:10:59 2008 @@ -1,2 +1,2 @@ -FILE( GLOB ZYPPER_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po ) -GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/zypper.pot" ALL ${ZYPPER_PO_FILES} ) +FILE( GLOB ZYPPER_PO_FILES ${ZYPPER_SOURCE_DIR}/po/*.po ) +GETTEXT_CREATE_TRANSLATIONS( "${ZYPPER_SOURCE_DIR}/po/zypper.pot" ALL ${ZYPPER_PO_FILES} ) Modified: trunk/zypper/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=11572&r1=11571&r2=11572&view=diff ============================================================================== --- trunk/zypper/src/CMakeLists.txt (original) +++ trunk/zypper/src/CMakeLists.txt Tue Nov 4 16:10:59 2008 @@ -1,11 +1,11 @@ ADD_DEFINITIONS ( - -DPACKAGE=\\\"${PACKAGE}\\\" - -DLOCALEDIR=\\\"${INSTALL_PREFIX}/share/locale\\\" + -DPACKAGE="${PACKAGE}" + -DLOCALEDIR="${INSTALL_PREFIX}/share/locale" ) MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" ) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES(${ZYPPER_SOURCE_DIR}/src) SET (zypper_HEADERS Zypper.h -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org