Merge pull request #1329 from ACSimon33/constant_nan

Explicit NaNs with NAG Fortran and LAPACKE mangling issue fix

CBLAS/CMakeLists.txt

@@ -24,7 +24,7 @@ else()
                           HAS_ATTRIBUTE_WEAK_SUPPORT)
 endif()
 
-include_directories(include ${LAPACK_BINARY_DIR}/include)
+include_directories(${LAPACK_BINARY_DIR}/include include)
 add_subdirectory(src)
 
 macro(append_subdir_files variable dirname)

LAPACKE/CMakeLists.txt

@@ -3,7 +3,7 @@ enable_language(C)
 
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 
-include_directories(include ${LAPACK_BINARY_DIR}/include)
+include_directories(${LAPACK_BINARY_DIR}/include include)
 add_subdirectory(src)
 add_subdirectory(utils)
 

LAPACKE/include/lapacke_mangling.h

@@ -1,16 +0,0 @@
-#ifndef LAPACK_HEADER_INCLUDED
-#define LAPACK_HEADER_INCLUDED
-
-#ifndef LAPACK_GLOBAL
-#if defined(LAPACK_GLOBAL_PATTERN_LC) || defined(ADD_)
-#define LAPACK_GLOBAL(lcname,UCNAME)  lcname##_
-#elif defined(LAPACK_GLOBAL_PATTERN_UC) || defined(UPPER)
-#define LAPACK_GLOBAL(lcname,UCNAME)  UCNAME
-#elif defined(LAPACK_GLOBAL_PATTERN_MC) || defined(NOCHANGE)
-#define LAPACK_GLOBAL(lcname,UCNAME)  lcname
-#else
-#define LAPACK_GLOBAL(lcname,UCNAME)  lcname##_
-#endif
-#endif
-
-#endif

TESTING/LIN/CMakeLists.txt

@@ -209,6 +209,14 @@ else()
                       zerrvx.f zerrge.f zerrhe.f zerrsy.f zerrpo.f)
 endif()
 
+# Disable constant propagation for NAG compiler to avoid issues with
+# creating NaN values in the CXX error-exit tests.
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+  set_source_files_properties(
+    serrcxx.f cerrcxx.f derrcxx.f zerrcxx.f
+    PROPERTIES COMPILE_OPTIONS "-Onopropagate")
+endif()
+
 set(DSLINTST dchkab.f
 	ddrvab.f ddrvac.f derrab.f derrac.f dget08.f
 	alaerh.f alahd.f  aladhd.f alareq.f