Fix parsing DESCRDIR from content file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 942ea0a..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}" )
@@ -86,11 +92,15 @@ SET (CPACK_SOURCE_IGNORE_FILES
 "Makefile$"
 "Makefile\\\\.in$"
 # cmake cache files
+"DartConfiguration.tcl$"
 "CMakeCache.txt"
 "CMakeFiles"
 "cmake_install.cmake$"
 "CMakeLists.txt.auto$"
+"CTestTestfile.cmake"
 "CPackConfig.cmake$"
+"CPackSourceConfig.cmake$"
+"libsatsolver.spec$"
 )
 
 INCLUDE(CPack)
@@ -113,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" )
@@ -126,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}")
@@ -154,6 +170,7 @@ ADD_CUSTOM_TARGET( svncheck
 
 SET( AUTOBUILD_COMMAND
   COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/package/*.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