[Uml-devel] branches/work/soc-umbrello

[Andi Fischer]

SVN commit 1217819 by fischer:

New files basictypes with unittests added. Is not yet used.

 M  +8 -1      CMakeLists.txt  
 M  +1 -0      umbrello/CMakeLists.txt  
 A             umbrello/basictypes.cpp   [License: GPL (v2+)]
 A             umbrello/basictypes.h   [License: GPL (v2+)]
 A             unittests (directory)  
 A             unittests/CMakeLists.txt  
 A             unittests/TEST_basictypes.cpp   [License: UNKNOWN]


--- branches/work/soc-umbrello/CMakeLists.txt #1217818:1217819
@@ -1,8 +1,10 @@
+cmake_minimum_required(VERSION 2.8)
 project(umbrello)
 
+set(KDE4_BUILD_TESTS ON)  # for unit tests
 
 # search packages used by KDE
-set(QT_MIN_VERSION "4.6.0")
+set(QT_MIN_VERSION "4.7.0")
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
@@ -28,3 +30,8 @@
 
 add_subdirectory(umbrello)
 
+# do we build the unit tests
+IF(KDE4_BUILD_TESTS)
+  ENABLE_TESTING()
+  add_subdirectory(unittests)  # for unit tests
+ENDIF(KDE4_BUILD_TESTS)
--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #1217818:1217819
@@ -365,6 +365,7 @@
     association.cpp
     assocrules.cpp
     attribute.cpp
+    basictypes.cpp
     category.cpp
     checkconstraint.cpp
     classifier.cpp