Explorar el Código

ENH: Comeau C++ has been added for nightly testing. It does not support shared libraries, so we cannot run the complex tests.

Brad King hace 23 años
padre
commit
fea02da5bd
Se han modificado 1 ficheros con 18 adiciones y 11 borrados
  1. 18 11
      Source/CMakeLists.txt

+ 18 - 11
Source/CMakeLists.txt

@@ -161,17 +161,24 @@ IF(BUILD_TESTING)
       ${CMake_BINARY_DIR}/Tests/LoadCommandOneConfig
       LoadedCommand ONLY_ONE_CONFIG)
 
-    ADD_TEST(complex ${CMake_BINARY_DIR}/Source/cmaketest 
-      ${CMake_SOURCE_DIR}/Tests/Complex 
-      ${CMake_BINARY_DIR}/Tests/Complex 
-      complex 
-      ${CMake_BINARY_DIR}/Tests/Complex/bin)
-
-    ADD_TEST(complexOneConfig ${CMake_BINARY_DIR}/Source/cmaketest 
-      ${CMake_SOURCE_DIR}/Tests/Complex 
-      ${CMake_BINARY_DIR}/Tests/ComplexOneConfig 
-      complex 
-      ${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin ONLY_ONE_CONFIG)
+    # Como does not seem to support shared libraries.
+    GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
+    IF(CMAKE_BASE_NAME MATCHES "^como$")
+      SET(COMPILER_IS_COMO 1)
+    ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
+    IF(NOT COMPILER_IS_COMO)
+      ADD_TEST(complex ${CMake_BINARY_DIR}/Source/cmaketest 
+        ${CMake_SOURCE_DIR}/Tests/Complex 
+        ${CMake_BINARY_DIR}/Tests/Complex 
+        complex 
+        ${CMake_BINARY_DIR}/Tests/Complex/bin)
+
+      ADD_TEST(complexOneConfig ${CMake_BINARY_DIR}/Source/cmaketest 
+        ${CMake_SOURCE_DIR}/Tests/Complex 
+        ${CMake_BINARY_DIR}/Tests/ComplexOneConfig 
+        complex 
+        ${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin ONLY_ONE_CONFIG)
+    ENDIF(NOT COMPILER_IS_COMO)
 
     ADD_TEST(Example ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Example