Merge branch 'master' of gitorious.org:opensuse/libzypp

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8563bf4..fffec8f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,8 @@ MATH( EXPR LIBZYPP_AGE     "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" )
 MATH( EXPR LIBZYPP_SO_FIRST  "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" )
 SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" )
 
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" )
-SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -g -Wall -Werror=format-security -Wl,-as-needed" )
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" )
+SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Wl,-as-needed" )
 set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" )
 set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" )
 
@@ -76,28 +76,6 @@ ELSE (GETTEXT_FOUND)
   MESSAGE( FATAL_ERROR "Gettext not found" )
 ENDIF (GETTEXT_FOUND)
 
-FIND_PACKAGE(Hal REQUIRED)
-IF ( NOT HAL_FOUND )
-  MESSAGE( WARNING " Package 'hal' not found. HAL is mainly used for CD/DVD device detection." )
-  MESSAGE( WARNING " If you build libzypp without HAL, this will result in a limited" )
-  MESSAGE( WARNING " CD/DVD device detection (/dev/dvd,/dev/cdrom)." )
-  SET(HAL_LIBRARY "")
-  SET(HAL_STORAGE_LIBRARY "")
-  ADD_DEFINITIONS(-DNO_HAL)
-ELSE ( NOT HAL_FOUND)
-  INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR})
-  # hal/libhal-storage.h is broken grrr
-  INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR}/hal)
-ENDIF( NOT HAL_FOUND)
-
-FIND_PACKAGE(Dbus REQUIRED)
-IF ( NOT DBUS_FOUND)
-  MESSAGE( FATAL_ERROR " dbus not found" )
-ELSE ( NOT DBUS_FOUND)
-  INCLUDE_DIRECTORIES(${DBUS_INCLUDE_DIR})
-  INCLUDE_DIRECTORIES(${DBUS_ARCH_INCLUDE_DIR})
-ENDIF( NOT DBUS_FOUND)
-
 FIND_PACKAGE(Curl REQUIRED)
 IF ( NOT CURL_FOUND)
   MESSAGE( FATAL_ERROR " curl not found" )
@@ -130,6 +108,15 @@ ENDIF( NOT SATSOLVER_FOUND )
 FIND_PACKAGE(EXPAT REQUIRED)
 
 FIND_PACKAGE(OpenSSL REQUIRED)
+FIND_PACKAGE(Udev REQUIRED)
+
+FIND_PACKAGE(libproxy)
+IF ( NOT LIBPROXY_FOUND )
+  MESSAGE( FATAL_ERROR " libproxy not found" )
+ELSE ( NOT LIBPROXY_FOUND )
+  INCLUDE_DIRECTORIES( ${LIBPROXY_INCLUDE_DIR} )
+  ADD_DEFINITIONS(-D_WITH_LIBPROXY_SUPPORT_)
+ENDIF( NOT LIBPROXY_FOUND )
 
 FIND_PROGRAM( DOXYGEN doxygen )
 IF ( NOT DOXYGEN )
@@ -173,7 +160,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 )