hopefully fix build in beta

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6519983..4a23e0a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ PROJECT(libzypp)
 SET( PACKAGE "libzypp" )
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+cmake_minimum_required(VERSION 2.4.5)
 
 INCLUDE(ZyppCommon)
 INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
@@ -29,7 +30,7 @@ INCLUDE(CPack)
 
 MACRO(ADD_TESTS)
   FOREACH( loop_var ${ARGV} )
-    SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.cc COMPILE_FLAGS "-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN" )
+    SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.cc COMPILE_FLAGS "-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN -DBOOST_AUTO_TEST_MAIN=\"\" " )
     ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc )
     TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework)
     ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test)
@@ -40,9 +41,11 @@ ENDMACRO(ADD_TESTS)
 
 FIND_PACKAGE(Rpm REQUIRED)
 IF ( NOT RPM_FOUND)
-  MESSAGE( FATAL_ERROR " rpm not found" )
+  MESSAGE( FATAL_ERROR " rpm-devel not found" )
 ELSE ( NOT RPM_FOUND)
   INCLUDE_DIRECTORIES(${RPM_INCLUDE_DIR})
+  # fix includes not relative to rpm
+  INCLUDE_DIRECTORIES(${RPM_INCLUDE_DIR}/rpm)
 ENDIF( NOT RPM_FOUND)
 
 FIND_PACKAGE(Boost REQUIRED)
@@ -77,15 +80,6 @@ ELSE ( NOT DBUS_FOUND)
   INCLUDE_DIRECTORIES(${DBUS_ARCH_INCLUDE_DIR})
 ENDIF( NOT DBUS_FOUND)
 
-FIND_PACKAGE(Glib REQUIRED)
-IF (GLIB_FOUND)
-  MESSAGE( STATUS "glib found: includes in ${GLIB_INCLUDE_DIR}, library in ${GLIB_LIBRARY}")
-  INCLUDE_DIRECTORIES(${GLIB_INCLUDE_DIR})
-  INCLUDE_DIRECTORIES(${GLIB_CONFIG_INCLUDE_DIR})
-ELSE(GLIB_FOUND)
-  MESSAGE( FATAL_ERROR "glib not found" )
-ENDIF(GLIB_FOUND)
-
 FIND_PACKAGE(Curl REQUIRED)
 IF ( NOT CURL_FOUND)
   MESSAGE( FATAL_ERROR " curl not found" )
@@ -114,6 +108,8 @@ ELSE ( NOT SATSOLVER_FOUND )
   INCLUDE_DIRECTORIES( ${SATSOLVER_INCLUDE_DIR} )
 ENDIF( NOT SATSOLVER_FOUND )
 
+FIND_PACKAGE(OpenSSL REQUIRED)
+
 FIND_PROGRAM( DOXYGEN doxygen )
 IF ( NOT DOXYGEN )
   MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." )