[kmobiletools] KDE/kdepim/kmobiletools

[Marco Gulino]

SVN commit 678527 by gulino:

More path fixing.
Also making tests compile only by option.


 M  +7 -2      CMakeLists.txt  
 M  +1 -1      kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.cpp  
 M  +0 -1      tests/testlibkmobiletools/CMakeLists.txt  
 M  +1 -1      tests/testlibkmobiletools/testlibkmobiletools.cpp  


--- trunk/KDE/kdepim/kmobiletools/CMakeLists.txt #678526:678527
@@ -5,7 +5,8 @@
 
 add_definitions(-DQT3_SUPPORT)
 add_definitions(-DQT3_SUPPORT_WARNINGS)
-OPTION(USE_CRASHHANDLER "Use internal CrashHandler Manager" OFF)
+OPTION(KMOBILETOOLS_USE_CRASHHANDLER "Use internal CrashHandler Manager" OFF)
+OPTION(KMOBILETOOLS_ENABLE_TESTS "Enable compilation of testing applications" OFF)
 
 
 
@@ -17,6 +18,10 @@
 configure_file( config-kmobiletools.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmobiletools.h )
 
 add_subdirectory( kmobiletools )
-add_subdirectory ( tests )
+if ( KMOBILETOOLS_ENABLE_TESTS )
+    add_subdirectory ( tests )
+    message ( "-- Enabling KMobileTools tests compilation" )
+endif ( KMOBILETOOLS_ENABLE_TESTS )
+
 #add_subdirectory( kbluetoothpairingwizard )
 #add_subdirectory( kmtsetup )
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.cpp #678526:678527
@@ -21,7 +21,7 @@
 #include "akonadi_serializer_sms.h"
 
 #include <kdebug.h>
-#include <sms.h>
+#include <libkmobiletools/sms.h>
 #include <boost/shared_ptr.hpp>
 
 #include <libakonadi/item.h>
--- trunk/KDE/kdepim/kmobiletools/tests/testlibkmobiletools/CMakeLists.txt #678526:678527
@@ -2,7 +2,6 @@
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../../kmobiletools
    ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_SOURCE_DIR}/kmobiletools/kmobiletools/libkmobiletools
    )
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 set(testlibkmobiletools_SRCS testlibkmobiletools.cpp )
--- trunk/KDE/kdepim/kmobiletools/tests/testlibkmobiletools/testlibkmobiletools.cpp #678526:678527
@@ -22,11 +22,11 @@
  ***************************************************************************/
 #include "testlibkmobiletools.h"
 #include <libkmobiletools/sms.h>
+#include <libkmobiletools/akonadi/akonadi_serializer_sms.cpp>
 #include <QTextStream>
 #include <kcmdlineargs.h>
 #include <QTimer>
 #include <libakonadi/collection.h>
-#include "akonadi/akonadi_serializer_sms.cpp"
 #include <KDateTime>
 
 // using namespace KMobileTools;