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

[QbProg]

The following commit has been merged in the debian branch:
commit e9ad629b562b5a75d0f90d938fc32dbb93ab88b6
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Jun 3 10:45:27 2012 +0200

    Link TDataXtd_test against FWOSPlugin
    
    This executable loads FWOSPlugin at run-time.  But plugins are not
    installed at their final location when test is run, so a wrong
    library may be loaded instead.  Link against this library to avoid
    this mismatch.
    
    Moreover set CSF_PluginDefaults and CSF_PluginUserDefaults environment
    variable when running this test to load resource file from the build
    tree.
    
    This commit fixes issue #278.

diff --git a/test/TDataXtd_test/CMakeLists.txt b/test/TDataXtd_test/CMakeLists.txt
index c5a24b7..7ef44ff 100644
--- a/test/TDataXtd_test/CMakeLists.txt
+++ b/test/TDataXtd_test/CMakeLists.txt
@@ -1,3 +1,9 @@
-IF (${PROJECT_NAME}_DATAEXCHANGE AND NOT ${PROJECT_NAME}_DISABLE_X11)
-    ADD_OCE_TEST(TDataXtd_test "TKCAF;TKXCAF")
-ENDIF (${PROJECT_NAME}_DATAEXCHANGE AND NOT ${PROJECT_NAME}_DISABLE_X11)
+IF (${PROJECT_NAME}_OCAF)
+    # This test will dlopen FWOSPlugin, we link against it to ensure that
+    # the library from the build tree is used.
+    ADD_OCE_TEST(TDataXtd_test "TKCAF;TKXCAF;FWOSPlugin")
+    FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" BuildPluginDir)
+    # Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be escaped
+    STRING(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}")
+    SET_TESTS_PROPERTIES(TDataXtdTestSuite.testPattern PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_PluginUserDefaults=${BuildPluginDir}")
+ENDIF (${PROJECT_NAME}_OCAF)

-- 
OCE packaging