Author: dmacvicar Date: Mon Nov 26 18:31:36 2007 New Revision: 42413 URL: http://svn.opensuse.org/viewcvs/yast?rev=42413&view=rev Log: - require devtools cmake files instead of duplicating everything Removed: branches/tmp/coolo/qt4-port/cmake/modules/FindYast.cmake Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/CMakeLists.txt?rev=42413&r1=42412&r2=42413&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/CMakeLists.txt Mon Nov 26 18:31:36 2007 @@ -1,87 +1,12 @@ PROJECT(yast2-qt4) - SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) -# Library -IF ( DEFINED LIB ) - SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) -ELSE ( DEFINED LIB ) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET( LIB_SUFFIX "64" ) - ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) -ENDIF ( DEFINED LIB ) -MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) - -# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) -#SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH}) - SET( PACKAGE "yast2-qt4" ) -INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) -SET ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Web UI for YaST") -SET(CPACK_PACKAGE_VENDOR "Novell Inc.") -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") -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 -"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/" -"~$" -"\\\\.cvsignore$" -"/package" -"Makefile\\\\.in$" -) - -INCLUDE(CPack) FIND_PACKAGE(Qt4 REQUIRED) - -IF ( ${QT_QTGUI_FOUND} ) - MESSAGE(FATAL "no qt3 ${QT_QTGUI_FOUND}") -ENDIF ( ${QT_QTGUI_FOUND} ) - FIND_PACKAGE(Yast REQUIRED) - -#################################################################### -# RPM SPEC # -#################################################################### -MESSAGE(STATUS "Writing spec file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY) +INCLUDE(YastCommon) ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - -ADD_CUSTOM_TARGET( svncheck - COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' -) - -SET( AUTOBUILD_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" -) - -ADD_CUSTOM_TARGET( autobuild_local - ${AUTOBUILD_COMMAND} -) - -ADD_CUSTOM_TARGET( autobuild - COMMAND ${CMAKE_MAKE_PROGRAM} svncheck - ${AUTOBUILD_COMMAND} -) - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org