Enable examples directory

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fb552d..2e4b1d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ MACRO(ADD_TESTS)
     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 zypp_test_utils)
-    ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test)
+    ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test --catch_system_errors=no)
   ENDFOREACH( loop_var )
 ENDMACRO(ADD_TESTS)
 
@@ -52,10 +52,13 @@ ELSE ( NOT RPM_FOUND)
   INCLUDE_DIRECTORIES(${RPM_INCLUDE_DIR})
   # fix includes not relative to rpm
   INCLUDE_DIRECTORIES(${RPM_INCLUDE_DIR}/rpm)
-  if (RPM_4_4_LEGACY)
-    MESSAGE( STATUS "Enable rpm 4.4 legacy interface")
-    ADD_DEFINITIONS(-D_RPM_4_4_COMPAT)
-  endif (RPM_4_4_LEGACY)
+  if ( RPM_SUSPECT_VERSION STREQUAL "5.x" )
+       MESSAGE( STATUS "rpm found: enable rpm-4 compat interface." )
+       ADD_DEFINITIONS(-D_RPM_5)
+  elseif ( RPM_SUSPECT_VERSION STREQUAL "4.x" )
+       MESSAGE( STATUS "rpm found: enable rpm-4.4 legacy interface." )
+       ADD_DEFINITIONS(-D_RPM_4_4_COMPAT)
+  endif ( RPM_SUSPECT_VERSION STREQUAL "5.x" )
 ENDIF( NOT RPM_FOUND)
 
 FIND_PACKAGE(Boost REQUIRED)
@@ -170,7 +173,7 @@ ADD_SUBDIRECTORY( zypp )
 # do not build devel by default
 ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
 ADD_SUBDIRECTORY( tools )
-#ADD_SUBDIRECTORY( examples )
+ADD_SUBDIRECTORY( examples )
 ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
 ADD_SUBDIRECTORY( doc )
 ADD_SUBDIRECTORY( vendor )