Author: dmacvicar Date: Tue Feb 5 16:16:02 2008 New Revision: 8475 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8475&view=rev Log: use ZYppCommon stuff Modified: branches/tmp/ma/jump_sat/zypper/CMakeLists.txt Modified: branches/tmp/ma/jump_sat/zypper/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/CMakeLists.txt?rev=8475&r1=8474&r2=8475&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/zypper/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/zypper/CMakeLists.txt Tue Feb 5 16:16:02 2008 @@ -1,7 +1,15 @@ PROJECT( zypper C CXX ) +SET( PACKAGE zypper ) -# VERSION +# 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 + ${CMAKE_MODULE_PATH} +) +INCLUDE(ZyppCommon) +# VERSION INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) @@ -9,74 +17,7 @@ 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" ) -# usr INSTALL_PREFIX - -IF( DEFINED CMAKE_INSTALL_PREFIX ) - SET( INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) -ELSE( DEFINED CMAKE_INSTALL_PREFIX ) - SET( INSTALL_PREFIX /usr ) -ENDIF( DEFINED CMAKE_INSTALL_PREFIX ) - -# system configuration dir (etc) - -IF( NOT DEFINED SYSCONFDIR ) - SET( SYSCONFDIR /etc ) -ENDIF( NOT DEFINED SYSCONFDIR ) -MESSAGE( "** Config files will be installed in ${SYSCONFDIR}" ) - -# system configuration dir (etc) - -IF( NOT DEFINED MANDIR ) - SET( MANDIR ${INSTALL_PREFIX}/share/man ) -ENDIF( NOT DEFINED MANDIR ) -MESSAGE( "** Manual files will be installed in ${MANDIR}" ) - -# PACKAGE - -SET( PACKAGE "zypper" ) - -# CPack - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line package management tool.") -SET(CPACK_PACKAGE_VENDOR "Novell Inc.") -SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) -SET(CPACK_GENERATOR "TBZ2") -SET(CPACK_SOURCE_GENERATOR "TBZ2") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}") - -# The following components are regex's to match anywhere (unless anchored) -# in absolute path + filename to find files or directories to be excluded -# from source tarball. -SET (CPACK_SOURCE_IGNORE_FILES -# svn files -"/\\\\.svn/" -# temporary files -"\\\\.swp$" -# backup files -"~$" -"\\\\.bak$" -# eclipse files -"\\\\.settings/" -"\\\\.cdtproject" -"\\\\.project" -"\\\\.cproject" -# other -"/build/" -"/_build/" -) - -INCLUDE(CPack) - -# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -SET( CMAKE_MODULE_PATH - # locally installed (development) version of libzypp - ${ZYPP_PREFIX}/share/cmake/Modules - # cmake modules not found in upstream - ${CMAKE_SOURCE_DIR}/cmake/modules -) - +GENERATE_PACKAGING(${PACKAGE} ${VERSION}) FIND_PACKAGE( Zypp REQUIRED ) IF( ZYPP_FOUND ) @@ -99,50 +40,11 @@ MESSAGE( FATAL_ERROR "readline not found" ) ENDIF( READLINE_FOUND ) - -# RPM spec file - -MESSAGE(STATUS "Writing RPM spec file...") -CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/zypper.spec.cmake - ${CMAKE_BINARY_DIR}/package/zypper.spec - @ONLY) - -MESSAGE(STATUS "version: ${VERSION}") - ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( po ) ADD_SUBDIRECTORY( doc ) -# svn check - -ADD_CUSTOM_TARGET( svncheck - COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' -) - -# generate source tarball, rpm spec file and copy them together with .changes -# file over to ${CMAKE_BINARY_DIR}/package dir - -SET( PACKAGE_COMMAND - COMMAND ${CMAKE_MAKE_PROGRAM} package_source - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package - COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" -) - -# make source tarball without svn check - -ADD_CUSTOM_TARGET( srcpackage_local - ${PACKAGE_COMMAND} -) - -# make source tarball with svn check - -ADD_CUSTOM_TARGET( srcpackage - COMMAND ${CMAKE_MAKE_PROGRAM} svncheck - ${PACKAGE_COMMAND} -) # documentation too important to be hidden in doc: INSTALL( -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org