Changeset 1638

Timestamp:

18/10/11 13:19:49 (7 months ago)

Author:

Freddie Akeroyd

Message:

Fix fortran building. Refs #281

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• applications/CMakeLists.txt (modified) (1 diff)
• applications/NXbrowse/CMakeLists.txt (modified) (2 diffs)
• bindings/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -97 +97 @@
 if(SZIPLIB_FOUND)
    set(SZIP_LINK "-lsz")
+else(SZIPLIB_FOUND)
+   set(SZIP_LIB "")
 endif(SZIPLIB_FOUND)
 
@@ -120 +122 @@
 option (BUILD_CONTRIB 
         "Should I build the user contributions?" OFF)
+
+#Build user contributions
+option (BUILD_FORTRAN_BINDINGS 
+        "Should I build the fortran bindings?" OFF)
 
 #Use HDF4 in build
@@ -193 +199 @@
 
 #We need to be able to check for Fortran F77/90 - but how do we do this?
-if (BUILD_FORTRAN_BINDINGS)
+#if (BUILD_FORTRAN_BINDINGS)
     enable_language(Fortran)
-endif (BUILD_FORTRAN_BINDINGS)
+#endif (BUILD_FORTRAN_BINDINGS)
 
 #We need a NXDOCDIR as a place to install the docs for various packages.

trunk/applications/CMakeLists.txt

@@ -39 +39 @@
 add_subdirectory (NXconvert)
 
-if (CMAKE_Fortran_COMPILER_WORKS)
+if (BUILD_FORTRAN_BINDINGS AND CMAKE_Fortran_COMPILER_WORKS)
     add_subdirectory (NXdump)
-endif(CMAKE_Fortran_COMPILER_WORKS)
+endif()
 
 add_subdirectory (nxingest)

trunk/applications/NXbrowse/CMakeLists.txt

@@ -27 +27 @@
 #====================================================================
 
-if (CMAKE_Fortran_COMPILER_WORKS)
+if (BUILD_FORTRAN_BINDINGS AND CMAKE_Fortran_COMPILER_WORKS)
 
     include_directories(${CMAKE_BINARY_DIR}/bindings/f90)
@@ -41 +41 @@
     install (PROGRAMS NXbrowse90 DESTINATION bin)
 
-endif(CMAKE_Fortran_COMPILER_WORKS)
+endif()
 
 add_executable (nxbrowse NXbrowse.c)

trunk/bindings/CMakeLists.txt

@@ -28 +28 @@
 # Recurse into the subdirectories.
 add_subdirectory (cpp)
-if (CMAKE_Fortran_COMPILER_WORKS)
+if (BUILD_FORTRAN_BINDINGS AND CMAKE_Fortran_COMPILER_WORKS)
     add_subdirectory (f77)
     add_subdirectory (f90)
-endif (CMAKE_Fortran_COMPILER_WORKS)
+endif ()
 #add_subdirectory (idl)
 if (NOT(Java_JAVAC_EXECUTABLE MATCHES NOTFOUND))