Fix parsing DESCRDIR from content file

[platform/upstream/libsolv.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2d6f84..ba50426 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,13 @@ FIND_PACKAGE(EXPAT REQUIRED)
 FIND_PACKAGE(Check REQUIRED)
 FIND_PACKAGE(ZLIB REQUIRED)
 
+IF ( FEDORA )
+MESSAGE(STATUS "Building for Fedora")
+ADD_DEFINITIONS( -DFEDORA )
+FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm)
+ELSE ( FEDORA )
 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
+ENDIF ( FEDORA)
 
 SET( PACKAGE "satsolver" )
 SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" )
@@ -48,9 +54,11 @@ SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${LIBSATSOLVER_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${LIBSATSOLVER_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${LIBSATSOLVER_PATCH})
-SET( CPACK_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_GENERATOR "TBZ2")
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
+SET(CPACK_GENERATOR "TBZ2")
+SET(CPACK_SOURCE_GENERATOR "TBZ2")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}")
+SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source:")
+SET(CPACK_TOPLEVEL_TAG "Linux-Source:")
 
 # The following components are regex's to match anywhere (unless anchored)
 # in absolute path + filename to find files or directories to be excluded
@@ -81,12 +89,18 @@ SET (CPACK_SOURCE_IGNORE_FILES
 "\\\\.o$"
 "\\\\.lo$"
 "\\\\.la$"
+"Makefile$"
 "Makefile\\\\.in$"
-"testsuite/data.libzypp/kernel-tests/kernel-hardware"
-"testsuite/data.libzypp/yast-tests/kernel3-hardware"
 # cmake cache files
+"DartConfiguration.tcl$"
 "CMakeCache.txt"
 "CMakeFiles"
+"cmake_install.cmake$"
+"CMakeLists.txt.auto$"
+"CTestTestfile.cmake"
+"CPackConfig.cmake$"
+"CPackSourceConfig.cmake$"
+"libsatsolver.spec$"
 )
 
 INCLUDE(CPack)
@@ -109,10 +123,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOU
 ####################################################################
 
 MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
-#FIND_PROGRAM(SWIG_EXECUTABLE
-#  NAMES swig-1.3 swig
-#  PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
-#)
 
 set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall" )
 set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
@@ -122,11 +132,21 @@ ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(applayer)
 ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(doc)
 
-FIND_PACKAGE(SWIG REQUIRED)
+FIND_PACKAGE(SWIG)
 
 IF ( SWIG_FOUND )
   ADD_SUBDIRECTORY(bindings)
+ELSE ( SWIG_FOUND )
+ # for older version of swig/cmake
+ FIND_PROGRAM(SWIG_EXECUTABLE
+   NAMES swig-1.3 swig
+  PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
+ )
+ IF ( SWIG_EXECUTABLE )
+  ADD_SUBDIRECTORY(bindings)
+ ENDIF ( SWIG_EXECUTABLE )
 ENDIF ( SWIG_FOUND )
 
 MESSAGE(STATUS "version: ${VERSION}")
@@ -148,24 +168,12 @@ ADD_CUSTOM_TARGET( svncheck
   COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
 )
 
-
-# backup dist command while cpack is kaputt
-SET(DIST_COMMAND 
-  COMMAND rm -rf ${CMAKE_BUILD_DIR}/package/${CPACK_SOURCE_PACKAGE_FILE_NAME}
-#  COMMAND mkdir -p "${CMAKE_BUILD_DIR}/package/${CPACK_SOURCE_PACKAGE_FILE_NAME}"
-                  COMMAND cp -r "${CMAKE_SOURCE_DIR}" "/tmp/${CPACK_SOURCE_PACKAGE_FILE_NAME}"
-                  COMMAND tar -jcf "${CMAKE_BINARY_DIR}/package/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2" -C "/tmp" --exclude-vcs --exclude=".hidden" --exclude="build" ${CPACK_SOURCE_PACKAGE_FILE_NAME} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-                  COMMAND rm -rf "/tmp/${CPACK_SOURCE_PACKAGE_FILE_NAME}"
-)
-
-ADD_CUSTOM_TARGET( dist ${DIST_COMMAND} )
-
 SET( AUTOBUILD_COMMAND
   COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/package/*.tar.bz2
-#  COMMAND ${CMAKE_MAKE_PROGRAM} package_source
-  COMMAND ${CMAKE_MAKE_PROGRAM} dist
-  #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 mkdir -p _CPack_Packages/${CPACK_TOPLEVEL_TAG}
+  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/libsatsolver.changes" "${CMAKE_BINARY_DIR}/package/libsatsolver.changes"
 )