[med-svn] [castxml] 02/04: Imported Upstream version 0.1+git20150721

Steven Michael Robbins smr at moszumanska.debian.org
Thu Jul 23 13:33:51 UTC 2015


This is an automated email from the git hooks/post-receive script.

smr pushed a commit to branch master
in repository castxml.

commit bb2e2044bacbb88f4f5aaa27f61948c68d24d773
Author: Steve M. Robbins <smr at sumost.ca>
Date:   Tue Jul 21 13:19:31 2015 -0500

    Imported Upstream version 0.1+git20150721
---
 src/Version.cmake   |  2 +-
 test/CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/Version.cmake b/src/Version.cmake
index 846b198..c0da795 100644
--- a/src/Version.cmake
+++ b/src/Version.cmake
@@ -39,7 +39,7 @@ elseif(COMMAND _git)
       set(CastXML_VERSION "${CastXML_VERSION}-git")
     endif()
   endif()
-elseif("e733b8c" MATCHES "^([0-9a-f]+)$")
+elseif("d30d102" MATCHES "^([0-9a-f]+)$")
   # Use version exported by 'git archive'.
   set(CastXML_VERSION "${CastXML_VERSION}-g${CMAKE_MATCH_1}")
 else()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 653f5a2..a104cb9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -300,22 +300,44 @@ endforeach()
 
 if(TEST_GNU_C)
   set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu ${TEST_GNU_C})
-  castxml_test_gccxml_c(GNU-float128)
-  set(castxml_test_gccxml_custom_input GNU-float128)
-  set(castxml_test_gccxml_custom_start "")
-  castxml_test_gccxml_c(GNU-float128-nostart)
-  unset(castxml_test_gccxml_custom_start)
-  unset(castxml_test_gccxml_custom_input)
+
+  # Check if the GNU compiler supports __float128 to enable test.
+  execute_process(
+    COMMAND ${TEST_GNU_C} -c ${CMAKE_CURRENT_SOURCE_DIR}/input/GNU-float128.c
+    OUTPUT_VARIABLE out
+    ERROR_VARIABLE out
+    RESULT_VARIABLE failed_float128_c
+    )
+  if(NOT failed_float128_c)
+    castxml_test_gccxml_c(GNU-float128)
+    set(castxml_test_gccxml_custom_input GNU-float128)
+    set(castxml_test_gccxml_custom_start "")
+    castxml_test_gccxml_c(GNU-float128-nostart)
+    unset(castxml_test_gccxml_custom_start)
+    unset(castxml_test_gccxml_custom_input)
+  endif()
+
   unset(castxml_test_gccxml_extra_arguments)
 endif()
 
 if(TEST_GNU_CXX)
   set(castxml_test_gccxml_extra_arguments --castxml-cc-gnu ${TEST_GNU_CXX})
-  castxml_test_gccxml(GNU-float128)
-  set(castxml_test_gccxml_custom_input GNU-float128)
-  set(castxml_test_gccxml_custom_start "")
-  castxml_test_gccxml(GNU-float128-nostart)
-  unset(castxml_test_gccxml_custom_start)
-  unset(castxml_test_gccxml_custom_input)
+
+  # Check if the GNU compiler supports __float128 to enable test.
+  execute_process(
+    COMMAND ${TEST_GNU_CXX} -c ${CMAKE_CURRENT_SOURCE_DIR}/input/GNU-float128.cxx
+    OUTPUT_VARIABLE out
+    ERROR_VARIABLE out
+    RESULT_VARIABLE failed_float128_cxx
+    )
+  if(NOT failed_float128_cxx)
+    castxml_test_gccxml(GNU-float128)
+    set(castxml_test_gccxml_custom_input GNU-float128)
+    set(castxml_test_gccxml_custom_start "")
+    castxml_test_gccxml(GNU-float128-nostart)
+    unset(castxml_test_gccxml_custom_start)
+    unset(castxml_test_gccxml_custom_input)
+  endif()
+
   unset(castxml_test_gccxml_extra_arguments)
 endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/castxml.git



More information about the debian-med-commit mailing list