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

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

Revision: 9937
          http://plplot.svn.sourceforge.net/plplot/?rev=9937&view=rev
Author:   arjenmarkus
Date:     2009-05-08 04:27:00 +0000 (Fri, 08 May 2009)

Log Message:
-----------
Added logic to determine if a separate library must be created for supporting command-line options in Fortran. The test is heuristic for the moment - that is: needed for dynamic libraries, built on Cygwin/MinGW/MSYS.

Modified Paths:
--------------
    trunk/cmake/modules/TestF77CmdLine.cmake
    trunk/cmake/modules/fortran.cmake

Modified: trunk/cmake/modules/TestF77CmdLine.cmake
===================================================================
--- trunk/cmake/modules/TestF77CmdLine.cmake	2009-05-07 18:16:53 UTC (rev 9936)
+++ trunk/cmake/modules/TestF77CmdLine.cmake	2009-05-08 04:27:00 UTC (rev 9937)
@@ -52,3 +52,19 @@
   ENDIF (CMAKE_F77_CMD_LINE)
 ENDIF(NOT DEFINED CMAKE_F77_CMD_LINE)
 
+# On some Windows platforms the plparseopts routine should be in a
+# static library
+
+SET(STATIC OFF)
+IF(WIN32)
+  IF(MINGW OR CYGWIN)
+    IF(BUILD_SHARED_LIBS)
+      SET(STATIC ON)
+    ENDIF(BUILD_SHARED_LIBS)
+  ENDIF(MINGW OR CYGWIN)
+ENDIF(WIN32)
+IF(STATIC)
+  SET(STATIC_OPTS ON CACHE BOOL "Command-line parsing in static library")
+ELSE(STATIC)
+  SET(STATIC_OPTS OFF CACHE BOOL "Command-line parsing in static library")
+ENDIF(STATIC)

Modified: trunk/cmake/modules/fortran.cmake
===================================================================
--- trunk/cmake/modules/fortran.cmake	2009-05-07 18:16:53 UTC (rev 9936)
+++ trunk/cmake/modules/fortran.cmake	2009-05-08 04:27:00 UTC (rev 9937)
@@ -57,10 +57,8 @@
   # Set installation location for f95 modules.
   set(F95_MOD_DIR ${LIB_DIR}/fortran/modules/${PACKAGE})
 
-  # Check if f77 command line parsing is possible
-  if(ENABLE_f77)
-    include(TestF77CmdLine)
-  endif(ENABLE_f77)
+  # Check if f77/f95 style command line parsing is possible
+  include(TestF77CmdLine)
 
   # Check if isnan is available as an fortran function
   include(TestFortranIsnan)


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