also allow the tree as a subproject.

some cmake 2.6 cleanups

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a7452e..3d15e65 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,20 @@
-PROJECT( zypper C CXX )
-SET( PACKAGE zypper )
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT( ZYPPER C CXX )
+SET( PACKAGE "zypper" )
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 SET( CMAKE_MODULE_PATH
   ${ZYPP_PREFIX}/share/cmake/Modules
-  ${CMAKE_SOURCE_DIR}/cmake/modules
+  ${ZYPPER_SOURCE_DIR}/cmake/modules
   ${CMAKE_MODULE_PATH}
 )
 INCLUDE(ZyppCommon)
 
 # VERSION
-INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
+INCLUDE( ${ZYPPER_SOURCE_DIR}/VERSION.cmake )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
-ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" )
+ADD_DEFINITIONS( -DVERSION="${VERSION}" )
 
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" )
 SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -O2 -Wall -fstack-protector" )

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 28787b2..a492373 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,2 +1,2 @@
-FILE( GLOB ZYPPER_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po )
-GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/zypper.pot" ALL ${ZYPPER_PO_FILES} )
+FILE( GLOB ZYPPER_PO_FILES ${ZYPPER_SOURCE_DIR}/po/*.po )
+GETTEXT_CREATE_TRANSLATIONS( "${ZYPPER_SOURCE_DIR}/po/zypper.pot" ALL ${ZYPPER_PO_FILES} )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 056a44c..b71cd06 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
 ADD_DEFINITIONS (
-  -DPACKAGE=\\\"${PACKAGE}\\\"
-  -DLOCALEDIR=\\\"${INSTALL_PREFIX}/share/locale\\\"
+  -DPACKAGE="${PACKAGE}"
+  -DLOCALEDIR="${INSTALL_PREFIX}/share/locale"
 )
 
 MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" )
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${ZYPPER_SOURCE_DIR}/src)
 
 SET (zypper_HEADERS
   Zypper.h