Branch 'libkolab-0.4' - 2 commits - CMakeLists.txt

[Christian Mollekopf]

 CMakeLists.txt |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f24fa274f0365a5a0662213b5b781b3f2dbc234f
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat Jan 26 02:50:37 2013 +0100

    Define Libkolab_VERSION_STRING.
    
    Otherwise tests fail and the product id string lacks the libkolab identifier.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d46c48..69b4532 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ set(Libkolab_VERSION_MINOR 4)
 set(Libkolab_VERSION_PATCH 1)
 set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
 #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR} )
-#set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
+set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
 
 # set up install directories.
 set(LIB_INSTALL_DIR lib CACHE STRING "The directories where to install libraries to")


commit dd2b3977b13770dc44eeb0da9d636bce6155b4d0
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat Jan 26 02:48:04 2013 +0100

    Revert "We require boost."
    
    That was already a few lines below...
    
    This reverts commit 033f29cdc7f73719e406601d57fe60a17bd8876c.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f0cb57..7d46c48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,8 +62,6 @@ endif()
 
 find_package(SWIG)
 
-find_package(Boost REQUIRED)
-
 #Show summary of found libraries
 macro_display_feature_log()