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

Denis Barbier bouzim at gmail.com
Thu Dec 13 19:16:32 UTC 2012


The following commit has been merged in the debian branch:
commit bc50e52971da8e04646529de4242267cedb50915
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Nov 17 00:35:35 2012 +0100

    Run TDataXtd_test only if OCE_DISABLE_X11 option is not set
    
    It depends on TKCAF and TKXCAF modules which are built only
    if OCE_DISABLE_X11 is not set.
    
    Moreover TKXCAF is built by DATA_EXCHANGE and not OCAF, so
    we must check against DATA_EXCHANGE instead of OCAF.

diff --git a/test/TDataXtd_test/CMakeLists.txt b/test/TDataXtd_test/CMakeLists.txt
index ccec963..c5a24b7 100644
--- a/test/TDataXtd_test/CMakeLists.txt
+++ b/test/TDataXtd_test/CMakeLists.txt
@@ -1,3 +1,3 @@
-IF (${PROJECT_NAME}_OCAF)
+IF (${PROJECT_NAME}_DATAEXCHANGE AND NOT ${PROJECT_NAME}_DISABLE_X11)
     ADD_OCE_TEST(TDataXtd_test "TKCAF;TKXCAF")
-ENDIF (${PROJECT_NAME}_OCAF)
+ENDIF (${PROJECT_NAME}_DATAEXCHANGE AND NOT ${PROJECT_NAME}_DISABLE_X11)

-- 
OCE packaging



More information about the debian-science-commits mailing list