Imported Upstream version 17.25.4

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1245837..d3945f8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ OPTION (ENABLE_BUILD_DOCS "Build documentation by default?" OFF)
 OPTION (ENABLE_BUILD_TRANS "Build translation files by default?" OFF)
 OPTION (ENABLE_BUILD_TESTS "Build and run test suite by default?" OFF)
 OPTION (ENABLE_USE_THREADS "Enable using threads (NOT being used by threads!)?" OFF)
+OPTION (ENABLE_ZSTD_COMPRESSION "Build with zstd compression support?" OFF)
 OPTION (ENABLE_ZCHUNK_COMPRESSION "Build with zchunk compression support?" OFF)
 OPTION (DISABLE_MEDIABACKEND_TESTS "Disable Tests depending on Nginx and libfcgi?" OFF)
 
@@ -54,6 +55,7 @@ SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" )
 CONFIGURE_FILE ( zypp/APIConfig.h.in zypp/APIConfig.h )
 
 SET (CMAKE_CXX_STANDARD ${ZYPPCOMMON_CXX_STANDARD})
+SET (CMAKE_CXX_EXTENSIONS OFF)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 CHECK_C_COMPILER_FLAG("-Werror=format-security" CC_FORMAT_SECURITY)
@@ -182,6 +184,15 @@ ELSE ( NOT ZLIB_FOUND)
 ENDIF( NOT ZLIB_FOUND)
 
 
+FIND_PACKAGE(YAML-CPP REQUIRED)
+IF ( NOT YAML-CPP_FOUND)
+  MESSAGE( FATAL_ERROR " yaml-cpp not found" )
+ELSE ( NOT YAML-CPP_FOUND)
+  INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIR})
+ENDIF( NOT YAML-CPP_FOUND)
+
+
+
 #Allow to override the libsolv install location
 IF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
   execute_process(
@@ -195,7 +206,7 @@ IF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
   )
 
   INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/libsolv/include ${CMAKE_BINARY_DIR}/libsolv/ext ${CMAKE_BINARY_DIR}/libsolv/solvversion ${CMAKE_BINARY_DIR}/libsolv/solvversion/solv ${CMAKE_BINARY_DIR}/libsolv/ext/solv ${CMAKE_BINARY_DIR}/libsolv/include/solv )
-  SET( LibSolv_LIBRARIES ${LIBSOLV_BUILDDIR}/src/libsolv.a ${LIBSOLV_BUILDDIR}/ext/libsolvext.a )
+  SET( LibSolv_LIBRARIES ${LIBSOLV_BUILDDIR}/ext/libsolvext.a ${LIBSOLV_BUILDDIR}/src/libsolv.a )
 
 ELSE()
   FIND_PACKAGE(LibSolv REQUIRED ext)
@@ -204,6 +215,8 @@ ELSE()
     MESSAGE( FATAL_ERROR " libsolv not found" )
   ELSE()
     INCLUDE_DIRECTORIES( ${LibSolv_INCLUDE_DIRS} )
+    # static case: Assert libsolv.a ist the last one linked
+    SET(LibSolv_LIBRARIES ${LibSolv_LIBRARIES} ${LIBSOLV_LIBRARY})
   ENDIF()
 ENDIF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
 
@@ -247,6 +260,14 @@ ELSE ( NOT DOXYGEN )
   MESSAGE( STATUS "doxygen found: ${DOXYGEN}" )
 ENDIF ( NOT DOXYGEN )
 
+# By now just libsolvs external references require us to link against it:
+IF (ENABLE_ZSTD_COMPRESSION)
+  MESSAGE("Building with zstd support enabled.")
+  FIND_LIBRARY (ZSTD_LIBRARY NAMES zstd)
+  FIND_PATH (ZSTD_INCLUDE_DIRS zstd.h)
+  #INCLUDE_DIRECTORIES (${ZSTD_INCLUDE_DIRS})
+ENDIF (ENABLE_ZSTD_COMPRESSION)
+
 IF (ENABLE_ZCHUNK_COMPRESSION)
   MESSAGE("Building with zchunk support enabled.")
   PKG_CHECK_MODULES (ZCHUNK zck REQUIRED)