3 commits - cmake/modules tests/CMakeLists.txt tests/serializers.h

[Till Adam]

 cmake/modules/FindLibkolabxmlDependencies.cmake |    2 +-
 tests/CMakeLists.txt                            |    5 ++++-
 tests/serializers.h                             |    6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit e493785b22b63c89408317ad010d0fbca37a40d3
Author: Till Adam <till at kdab.com>
Date:   Tue Jul 24 15:37:40 2012 +0200

    Build with clang.

diff --git a/tests/serializers.h b/tests/serializers.h
index e7523d8..978a67e 100644
--- a/tests/serializers.h
+++ b/tests/serializers.h
@@ -147,8 +147,8 @@ namespace QTest {
     char *toString(const Kolab::Alarm &a)
     {
         QByteArray ba = "Kolab::Alarm(";
-        ba += QByteArray::number(a.type()) + "\n " + QString::fromStdString(a.summary()).toAscii()+ "\n " + 
-        QString::fromStdString(a.text()).toAscii()+"\n " +toString(a.duration()) + "\n " + QByteArray::number(a.numrepeat())+  "\n " + toString(a.start()) + "\n " +
+        ba += QByteArray::number(a.type()) + "\n " + QString::fromStdString(a.summary())+ "\n " + 
+        QString::fromStdString(a.text())+"\n " +toString(a.duration()) + "\n " + QByteArray::number(a.numrepeat())+  "\n " + toString(a.start()) + "\n " +
         toString(a.relativeStart())  + "\n " +  QByteArray::number(a.relativeTo()) + "\n " + toString(a.audioFile()) +  "\n " + toString(a.attendees()) + "\n ";
         ba += ")";
         return qstrdup(ba.data());
@@ -193,7 +193,7 @@ namespace QTest {
     {
         QByteArray ba = "Kolab::Affiliation(";
         ba += QString::fromStdString(a.organisation()).toAscii()+ "\n " + 
-        QString::fromStdString(a.logo()).toAscii()+"\n " + "\n " + toString(a.roles())+  "\n " + toString(a.relateds()) + "\n " +
+        QString::fromStdString(a.logo())+"\n " + "\n " + toString(a.roles())+  "\n " + toString(a.relateds()) + "\n " +
         toString(a.addresses())  + "\n ";
         ba += ")";
         return qstrdup(ba.data());


commit ebd24728463e93c93b772f7a21c98310aadf0543
Author: Till Adam <till at kdab.com>
Date:   Tue Jul 24 15:37:27 2012 +0200

    Don't do no-undefined on Mac.

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 06165d3..6b2cc7a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore)
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) 
+if (NOT APPLE)
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) 
+endif()
+
 if (QT4_FOUND)
     message("Buildings tests")
     QT4_AUTOMOC(bindingstest.cpp)


commit 7581f4faf9576177b9d221c00240f9afa8bf1298
Author: Till Adam <till at kdab.com>
Date:   Tue Jul 24 15:36:52 2012 +0200

    Find xsd on Mac as well.

diff --git a/cmake/modules/FindLibkolabxmlDependencies.cmake b/cmake/modules/FindLibkolabxmlDependencies.cmake
index 66eefd6..08bf0ed 100644
--- a/cmake/modules/FindLibkolabxmlDependencies.cmake
+++ b/cmake/modules/FindLibkolabxmlDependencies.cmake
@@ -16,7 +16,7 @@ else()
     set(UUID_LIBRARY_FOUND TRUE)
 endif()
 
-find_program(XSDCXX xsdcxx /usr/bin/)
+find_program(XSDCXX NAMES xsdcxx xsd /usr/bin/)
 if (XSDCXX)
     find_path(XSDCXX_INCLUDE_DIRS NAMES xsd/cxx/version.hxx)
 endif()