Imported Upstream version 14.30.0

[platform/upstream/libzypp.git] / cmake / modules / ZyppCommon.cmake

diff --git a/cmake/modules/ZyppCommon.cmake b/cmake/modules/ZyppCommon.cmake
index a19305d..8b3ec77 100644 (file)
--- a/cmake/modules/ZyppCommon.cmake
+++ b/cmake/modules/ZyppCommon.cmake
@@ -8,6 +8,13 @@ ELSE ( DEFINED  LIB )
   SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
 ENDIF ( DEFINED  LIB )
 MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" )
+# Headers
+IF (DEFINED INCLUDE)
+  SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE}")
+else (DEFINED INCLUDE)
+  SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
+ENDIF (DEFINED  INCLUDE)
+MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}")
 
 # system configuration dir (etc)
 IF( NOT DEFINED SYSCONFDIR )
@@ -60,7 +67,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CUR
 
 MACRO(SPECFILE)
   MESSAGE(STATUS "Writing spec file...")
-  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY)
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.cmake ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY)
   MESSAGE(STATUS "I hate you rpm-lint...!!!")
   IF (EXISTS ${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake)
     CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake ${CMAKE_BINARY_DIR}/package/${PACKAGE}-rpmlintrc @ONLY)
@@ -83,28 +90,19 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION)
   # in absolute path + filename to find files or directories to be excluded
   # from source tarball.
   SET (CPACK_SOURCE_IGNORE_FILES
-  #svn files
-  "\\\\.svn/"
-  "\\\\.cvsignore$"
+  # hidden files
+  "/\\\\..+$"
   # temporary files
   "\\\\.swp$"
   # backup files
   "~$"
-  # eclipse files
-  "\\\\.cdtproject$"
-  "\\\\.cproject$"
-  "\\\\.project$"
-  "\\\\.settings/"
   # others
   "\\\\.#"
   "/#"
   "/build/"
   "/_build/"
-  "/\\\\.git/"
   # used before
   "/CVS/"
-  "/\\\\.libs/"
-  "/\\\\.deps/"
   "\\\\.o$"
   "\\\\.lo$"
   "\\\\.la$"
@@ -122,11 +120,11 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION)
   SET( CPACK_SOURCE_GENERATOR "TBZ2")
   SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )
   INCLUDE(CPack)
-  
+
   SPECFILE()
-  
+
   ADD_CUSTOM_TARGET( svncheck
-    COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
+    COMMAND cd ${CMAKE_SOURCE_DIR} && LC_ALL=C git status | grep -q "nothing to commit .working directory clean."
   )
 
   SET( AUTOBUILD_COMMAND
@@ -136,11 +134,11 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION)
     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( srcpackage_local
     ${AUTOBUILD_COMMAND}
   )
-  
+
   ADD_CUSTOM_TARGET( srcpackage
     COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
     ${AUTOBUILD_COMMAND}