[Plplot-cvs] SF.net SVN: plplot: [8325] trunk/bindings/f95/CMakeLists.txt

[<ai...@us...>]

Revision: 8325
          http://plplot.svn.sourceforge.net/plplot/?rev=8325&view=rev
Author:   airwin
Date:     2008-03-23 17:00:05 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
There is a different location in the build tree for PLplot fortran modules
which depends on CMake version.  Adjust for this different location when
installing the PLplot fortran modules.

Modified Paths:
--------------
    trunk/bindings/f95/CMakeLists.txt

Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt	2008-03-23 21:35:48 UTC (rev 8324)
+++ trunk/bindings/f95/CMakeLists.txt	2008-03-24 00:00:05 UTC (rev 8325)
@@ -141,14 +141,30 @@
 RUNTIME DESTINATION ${BIN_DIR}
 )
 
-# Yuk! All Makefiles are run from the top level build directory and
-# so the f90 .mod files end up there rather than in the bindings/f95
-# directory. Ifort and pgf90 both have a -module command line option to
-# override this location, but I'm not sure how portable that?
-install(
-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod
-DESTINATION ${F95_MOD_DIR}
-)
+if(CMAKE_CACHE_MAJOR_VERSION EQUAL 2 AND CMAKE_CACHE_MINOR_VERSION EQUAL 4)
+  # Yuk! All Makefiles are run from the top level build directory and
+  # so the f90 .mod files end up there rather than in the bindings/f95
+  # directory. Ifort and pgf90 both have a -module command line option to
+  # override this location, but I'm not sure how portable that?
+  install(
+  FILES
+  ${CMAKE_BINARY_DIR}/plplot.mod
+  ${CMAKE_BINARY_DIR}/plplotp.mod
+  ${CMAKE_BINARY_DIR}/plplot_flt.mod
+  DESTINATION ${F95_MOD_DIR}
+  )
+else(CMAKE_CACHE_MAJOR_VERSION EQUAL 2 AND CMAKE_CACHE_MINOR_VERSION EQUAL 4)
+  # For the current cvs version of CMake, the module files are created by
+  # default during the library build in the more logical bindings/f95 
+  # directory.
+  install(
+  FILES
+  ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod
+  ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod
+  ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod
+  DESTINATION ${F95_MOD_DIR}
+  )
+endif(CMAKE_CACHE_MAJOR_VERSION EQUAL 2 AND CMAKE_CACHE_MINOR_VERSION EQUAL 4)
 
 # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG}
 if(PKG_CONFIG_EXECUTABLE)


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