[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

Denis Barbier bouzim at gmail.com
Fri Feb 24 18:50:59 UTC 2012 

The following commit has been merged in the upstream branch:
commit 8b3d07f80128b03b77a27e84ab1d1948c448dcc9
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Jan 19 23:16:07 2012 +0100

    Compile and run tests only if the needed components have been compiled

diff --git a/test/BRepAlgoAPI_test/CMakeLists.txt b/test/BRepAlgoAPI_test/CMakeLists.txt
index 05379ac..943bd1b 100644
--- a/test/BRepAlgoAPI_test/CMakeLists.txt
+++ b/test/BRepAlgoAPI_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(boolean_ops_test "TKPrim;TKBO")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(boolean_ops_test "TKPrim;TKBO")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/BRepExtrema_test/CMakeLists.txt b/test/BRepExtrema_test/CMakeLists.txt
index 808eaff..18eb5a8 100644
--- a/test/BRepExtrema_test/CMakeLists.txt
+++ b/test/BRepExtrema_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(BRepExtrema_test "TKPrim")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(BRepExtrema_test "TKPrim")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/BRepGProp_test/CMakeLists.txt b/test/BRepGProp_test/CMakeLists.txt
index 23d2614..5408381 100644
--- a/test/BRepGProp_test/CMakeLists.txt
+++ b/test/BRepGProp_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(BRepGProp_test "TKG2d;TKPrim;TKTopAlgo")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(BRepGProp_test "TKG2d;TKPrim;TKTopAlgo")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/BRepImport_test/CMakeLists.txt b/test/BRepImport_test/CMakeLists.txt
index 9e8a3b6..4d8ff30 100644
--- a/test/BRepImport_test/CMakeLists.txt
+++ b/test/BRepImport_test/CMakeLists.txt
@@ -1,11 +1,11 @@
-SET(brep_file_1 ${CMAKE_SOURCE_DIR}/test/data/brep/15_cylinder_head.brep)
-SET(brep_file_2 ${CMAKE_SOURCE_DIR}/test/data/brep/27_leverarm.brep)
-SET(brep_file_3 ${CMAKE_SOURCE_DIR}/test/data/brep/29_misc1.brep)
-SET(brep_file_4 ${CMAKE_SOURCE_DIR}/test/data/brep/31_misc2.brep)
+IF (${PROJECT_NAME}_DATAEXCHANGE)
+    SET(brep_file_1 ${CMAKE_SOURCE_DIR}/test/data/brep/15_cylinder_head.brep)
+    SET(brep_file_2 ${CMAKE_SOURCE_DIR}/test/data/brep/27_leverarm.brep)
+    SET(brep_file_3 ${CMAKE_SOURCE_DIR}/test/data/brep/29_misc1.brep)
+    SET(brep_file_4 ${CMAKE_SOURCE_DIR}/test/data/brep/31_misc2.brep)
 
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/BRepImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/BRepImport_test_config.h )
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
+    CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/BRepImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/BRepImport_test_config.h )
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
 
-ADD_OCE_TEST(BRepImport_test "TKernel;TKSTEP")
-	
-	
\ No newline at end of file
+    ADD_OCE_TEST(BRepImport_test "TKernel;TKSTEP")
+ENDIF (${PROJECT_NAME}_DATAEXCHANGE)
diff --git a/test/BRepMesh_test/CMakeLists.txt b/test/BRepMesh_test/CMakeLists.txt
index da288a3..854eba1 100644
--- a/test/BRepMesh_test/CMakeLists.txt
+++ b/test/BRepMesh_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(BRepMesh_test "TKernel;TKBRep;TKMath;TKTopAlgo;TKPrim;TKMesh")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(BRepMesh_test "TKernel;TKBRep;TKMath;TKTopAlgo;TKPrim;TKMesh")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/BRepOffsetAPI_test/CMakeLists.txt b/test/BRepOffsetAPI_test/CMakeLists.txt
index c797ccf..5f5f433 100644
--- a/test/BRepOffsetAPI_test/CMakeLists.txt
+++ b/test/BRepOffsetAPI_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(BRepOffsetAPI_test "TKOffset")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(BRepOffsetAPI_test "TKOffset")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/BRepPrimAPI_test/CMakeLists.txt b/test/BRepPrimAPI_test/CMakeLists.txt
index 27d6bcf..c764ba5 100644
--- a/test/BRepPrimAPI_test/CMakeLists.txt
+++ b/test/BRepPrimAPI_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(BRepPrimAPI_test "TKPrim")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(BRepPrimAPI_test "TKPrim")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/IGESImport_test/CMakeLists.txt b/test/IGESImport_test/CMakeLists.txt
index 4e9c96a..ecb4b16 100644
--- a/test/IGESImport_test/CMakeLists.txt
+++ b/test/IGESImport_test/CMakeLists.txt
@@ -1,8 +1,8 @@
 IF (${PROJECT_NAME}_DATAEXCHANGE)
-  SET(iges_file_1 ${CMAKE_SOURCE_DIR}/test/data/IGES/hammer.igs)
+    SET(iges_file_1 ${CMAKE_SOURCE_DIR}/test/data/IGES/hammer.igs)
 
-  CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/IGESImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/IGESImport_test_config.h )
-  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
+    CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/IGESImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/IGESImport_test_config.h )
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
 
-  ADD_OCE_TEST(IGESImport_test "TKernel;TKIGES")
-ENDIF(${PROJECT_NAME}_DATAEXCHANGE)
\ No newline at end of file
+    ADD_OCE_TEST(IGESImport_test "TKernel;TKIGES")
+ENDIF (${PROJECT_NAME}_DATAEXCHANGE)
diff --git a/test/STEPImport_test/CMakeLists.txt b/test/STEPImport_test/CMakeLists.txt
index da68707..45e58a1 100644
--- a/test/STEPImport_test/CMakeLists.txt
+++ b/test/STEPImport_test/CMakeLists.txt
@@ -1,10 +1,12 @@
-SET(step_file_ap203_1 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1-tu-203.stp)
-SET(step_file_ap203_2 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1_pe_203.stp)
-SET(step_file_ap214_1 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1-oc-214.stp)
-SET(step_file_ap214_2 ${CMAKE_SOURCE_DIR}/test/data/STEP/io1-cm-214.stp)
-SET(step_file_ap214_3 ${CMAKE_SOURCE_DIR}/test/data/STEP/sg1-c5-214.stp)
+IF (${PROJECT_NAME}_DATAEXCHANGE)
+    SET(step_file_ap203_1 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1-tu-203.stp)
+    SET(step_file_ap203_2 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1_pe_203.stp)
+    SET(step_file_ap214_1 ${CMAKE_SOURCE_DIR}/test/data/STEP/as1-oc-214.stp)
+    SET(step_file_ap214_2 ${CMAKE_SOURCE_DIR}/test/data/STEP/io1-cm-214.stp)
+    SET(step_file_ap214_3 ${CMAKE_SOURCE_DIR}/test/data/STEP/sg1-c5-214.stp)
 
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/STEPImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/STEPImport_test_config.h )
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
+    CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/STEPImport_test_config.h.cmake ${CMAKE_BINARY_DIR}/test_inc/STEPImport_test_config.h )
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/test_inc)
 
-ADD_OCE_TEST(STEPImport_test "TKernel;TKSTEP")
+    ADD_OCE_TEST(STEPImport_test "TKernel;TKSTEP")
+ENDIF (${PROJECT_NAME}_DATAEXCHANGE)
diff --git a/test/Standard_StdAllocator_test/CMakeLists.txt b/test/Standard_StdAllocator_test/CMakeLists.txt
index 845e915..b9f62a3 100644
--- a/test/Standard_StdAllocator_test/CMakeLists.txt
+++ b/test/Standard_StdAllocator_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(Standard_StdAllocator_test "TKernel;TKPrim")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(Standard_StdAllocator_test "TKernel;TKPrim")
+ENDIF (${PROJECT_NAME}_MODEL)
diff --git a/test/TDataXtd_test/CMakeLists.txt b/test/TDataXtd_test/CMakeLists.txt
index 9d4e0eb..ccec963 100644
--- a/test/TDataXtd_test/CMakeLists.txt
+++ b/test/TDataXtd_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 IF (${PROJECT_NAME}_OCAF)
-  ADD_OCE_TEST(TDataXtd_test "TKCAF;TKXCAF")
+    ADD_OCE_TEST(TDataXtd_test "TKCAF;TKXCAF")
 ENDIF (${PROJECT_NAME}_OCAF)
diff --git a/test/gp_test/CMakeLists.txt b/test/gp_test/CMakeLists.txt
index 1ae4675..a5e0a07 100644
--- a/test/gp_test/CMakeLists.txt
+++ b/test/gp_test/CMakeLists.txt
@@ -1 +1,3 @@
-ADD_OCE_TEST(gp_test "TKG2d")
+IF (${PROJECT_NAME}_MODEL)
+    ADD_OCE_TEST(gp_test "TKG2d")
+ENDIF (${PROJECT_NAME}_MODEL)

-- 
OCE packaging

More information about the debian-science-commits mailing list