[Plplot-cvs] SF.net SVN: plplot:[9445] trunk/cmake/modules

[<arj...@us...>]

Revision: 9445
          http://plplot.svn.sourceforge.net/plplot/?rev=9445&view=rev
Author:   arjenmarkus
Date:     2009-02-04 05:22:55 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Solve issue with testing for NaN-awareness on AIX (the changes are localised
the test: an examination of the source code revealed that this is the only
place where a system header file "nan.h" is used).

Modified Paths:
--------------
    trunk/cmake/modules/TestNaNAware.c
    trunk/cmake/modules/csiro.cmake

Modified: trunk/cmake/modules/TestNaNAware.c
===================================================================
--- trunk/cmake/modules/TestNaNAware.c	2009-02-04 02:40:51 UTC (rev 9444)
+++ trunk/cmake/modules/TestNaNAware.c	2009-02-04 05:22:55 UTC (rev 9445)
@@ -1,11 +1,19 @@
 /* Test for NaN awareness. */
 #include <stdio.h>
+#if defined(_AIX)
+#include "math.h"
+#else
 #include "nan.h"
+#endif
 
 int
 main()
 {
+#if defined(_AIX)
+   double x = NAN;
+#else
    double x = NaN;
+#endif
    /* N.B. CMake run-time tests need return of true (1) or false (0) not
     * the usual status code of 0 for success. */
 #if defined(_MSC_VER) | defined(__BORLANDC__)

Modified: trunk/cmake/modules/csiro.cmake
===================================================================
--- trunk/cmake/modules/csiro.cmake	2009-02-04 02:40:51 UTC (rev 9444)
+++ trunk/cmake/modules/csiro.cmake	2009-02-04 05:22:55 UTC (rev 9445)
@@ -43,7 +43,7 @@
     try_run(NaNAwareCCompiler COMPILE_RESULT
       ${CMAKE_BINARY_DIR}
       ${CMAKE_SOURCE_DIR}/cmake/modules/TestNaNAware.c
-      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa"
+      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa -lm"
       OUTPUT_VARIABLE OUTPUT
       )
     if(NOT COMPILE_RESULT)
@@ -83,7 +83,7 @@
       set(HAVE_QHULL OFF CACHE BOOL "Enable use of the Qhull library" FORCE)
     endif(QH_NEW_EXIST)
   else(QHULL_FOUND)
-    message(STATUS 
+    message(STATUS
       "WARNING: qhull library not found.  Setting HAVE_QHULL to OFF."
       )
     set(HAVE_QHULL OFF CACHE BOOL "Enable use of the Qhull library" FORCE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.