star-enclosures-2d

commit e96d4d22f6c0bd01aa6d92db8e1a02aebce14e66
parent 4ecfbbbe3df3a2f8b0d6f89801be4c6306551708
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 23 Jun 2020 11:22:12 +0200

Build optional tests even if not active

Diffstat:
M
cmake/CMakeLists.txt
 | 
19
+++++++++++--------

1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
 include(rcmake)
 include(rcmake_runtime)
-  
+
 if(NO_TEST)
   include_directories(
     ${RSys_INCLUDE_DIR}
@@ -53,8 +53,8 @@ else()
     ${RSys_INCLUDE_DIR}
     ${Star2D_INCLUDE_DIR}
     ${StarSP_INCLUDE_DIR})
-
-  if(HUGE_ADDITIONAL_TESTS)
+    
+if(NOT NO_TEST)
     rcmake_append_runtime_dirs(_runtime_dirs RSys StarSP Star2D)
   endif()
 endif()
@@ -160,17 +160,20 @@ if(NOT NO_TEST)
   new_test(test_senc2d_some_segments)
   new_test(test_senc2d_unspecified_medium)
   
+  build_test(test_senc2d_many_enclosures)
+  build_test(test_senc2d_many_segments)
+
   target_link_libraries(test_senc2d_enclosure Star2D)
   target_link_libraries(test_senc2d_sample_enclosure StarSP Star2D)
   
+  rcmake_copy_runtime_libraries(test_senc2d_many_enclosures test_senc2d_utils2.h)
+  rcmake_copy_runtime_libraries(test_senc2d_many_segments test_senc2d_utils2.h)
+
   rcmake_copy_runtime_libraries(test_senc2d_sample_enclosure)
 
   if(HUGE_ADDITIONAL_TESTS)
-    new_test(test_senc2d_many_enclosures)
-    new_test(test_senc2d_many_segments)
-    
-    rcmake_copy_runtime_libraries(test_senc2d_many_enclosures test_senc2d_utils2.h)
-    rcmake_copy_runtime_libraries(test_senc2d_many_segments test_senc2d_utils2.h)
+    add_test(test_senc2d_many_enclosures test_senc2d_many_enclosures)
+    add_test(test_senc2d_many_segments test_senc2d_many_segments)
   endif()
 endif()