3 commits - libkolabxml/CMakeLists.txt libkolabxml/lib

[Christian Mollekopf]

 libkolabxml/CMakeLists.txt |    6 ++++--
 libkolabxml/lib/utils.cpp  |   15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit b660b0270351fa73e9c6730094bf6bbe1637aabd
Merge: 771f372 6fa5b37
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Mar 28 08:45:45 2012 -0400

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-libs



commit 771f372ebdde3045b1920bea4f636a90a3fb07fb
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Mar 28 08:43:44 2012 -0400

    Test for qt properly

diff --git a/libkolabxml/CMakeLists.txt b/libkolabxml/CMakeLists.txt
index ffbaf57..69965da 100644
--- a/libkolabxml/CMakeLists.txt
+++ b/libkolabxml/CMakeLists.txt
@@ -126,7 +126,9 @@ include_directories( compiled )
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_subdirectory(lib)
-if (${QT_FOUND})
+if (QT4_FOUND)
     add_subdirectory(tests)
+else()
+    message("Qt libraries have not been found, not building tests")
 endif()
 


commit 61cb25d8b423f3f6bac3b9fa30800d5ecdd34416
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Mar 28 08:43:26 2012 -0400

    Use ossp-uuid and not the util-linux-ng version.

diff --git a/libkolabxml/CMakeLists.txt b/libkolabxml/CMakeLists.txt
index 946c93a..ffbaf57 100644
--- a/libkolabxml/CMakeLists.txt
+++ b/libkolabxml/CMakeLists.txt
@@ -23,7 +23,7 @@ if (Boost_FOUND)
 endif (Boost_FOUND)
 
 if (${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.42)
-    find_library(UUID NAMES ossp-uuid uuid)
+    find_library(UUID NAMES ossp-uuid)
     if(UUID)
         message("uuid found")
     else (UUID)
diff --git a/libkolabxml/lib/utils.cpp b/libkolabxml/lib/utils.cpp
index fb5f10b..164fd25 100644
--- a/libkolabxml/lib/utils.cpp
+++ b/libkolabxml/lib/utils.cpp
@@ -25,7 +25,7 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 #else
-#include <uuid/uuid.h>
+#include <uuid.h>
 #endif
 
 #include <boost/lexical_cast.hpp>
@@ -106,11 +106,14 @@ std::string getUID(const std::string &s)
         boost::uuids::uuid u; // initialize uuid
         return boost::uuids::to_string(u);
 #else
-        uuid_t u;
-        uuid_generate(u);
-        char out[37];
-        uuid_unparse(u,out);
-        return std::string(out, 36); //We don't need the terminating \0
+	uuid_t *uuid;
+        char *str = 0;
+        uuid_create(&uuid);
+        uuid_make(uuid, UUID_MAKE_V1);
+        uuid_export(uuid, UUID_FMT_STR, &str, 0);
+        uuid_destroy(uuid);
+
+        return std::string(str, 36); //We don't need the terminating \0
 #endif
     }
     return s;