[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[QbProg]

The following commit has been merged in the debian branch:
commit 5ef3473d401ff12fa1588d8f4bb89c2d3a68080e
Author: QbProg <tholag at gmail.com>
Date:   Sat Aug 25 17:46:20 2012 +0200

    Tests support for VC++ 2012

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ea6145b..64f0531 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,6 +12,11 @@ IF (USE_SOLUTION_FOLDERS)
 	SET_TARGET_PROPERTIES(gtest PROPERTIES FOLDER "Tests" )
 ENDIF(USE_SOLUTION_FOLDERS)
 
+# Fix for MSVC11
+IF(MSVC11)
+  ADD_DEFINITIONS("-D_VARIADIC_MAX=10")
+ENDIF()
+
 # Copied from CMake
 # Thanks to Daniel Blezek <blezek at gmail.com> for the GTEST_ADD_TESTS code
 function(GTEST_ADD_TESTS executable extra_args)
diff --git a/test/UnitsAPI_test/CMakeLists.txt b/test/UnitsAPI_test/CMakeLists.txt
index 9d84a7e..b4bceda 100644
--- a/test/UnitsAPI_test/CMakeLists.txt
+++ b/test/UnitsAPI_test/CMakeLists.txt
@@ -1,4 +1,5 @@
-SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS SRC_CASROOT="${${PROJECT_NAME}_SOURCE_DIR}" SRC_RESOURCE="${${PROJECT_NAME}_SOURCE_DIR}/src/UnitsAPI")
+GET_PROPERTY(CompileDefs DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${CompileDefs} SRC_CASROOT="${${PROJECT_NAME}_SOURCE_DIR}" SRC_RESOURCE="${${PROJECT_NAME}_SOURCE_DIR}/src/UnitsAPI")
 
 ADD_OCE_TEST(units_test "TKernel")
 

-- 
OCE packaging