Merge pull request #16 from zbeekman/bugfix

Bugfix for ROBODoc documentation generation with CMake

Author: jacobwilliams

.gitignore

@@ -2,4 +2,5 @@ bin/
 lib/
 builds/
 *.mod
-*.o
+*.o
+documentation/

CMakeLists.txt

@@ -94,13 +94,15 @@ set_target_properties ( ${LIB_NAME}-static
   PROPERTIES
   OUTPUT_NAME ${LIB_NAME}
   PREFIX lib
-  VERSION ${VERSION} )
+  VERSION ${VERSION}
+  ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 set_target_properties ( ${LIB_NAME}
   PROPERTIES
   OUTPUT_NAME ${LIB_NAME}
   PREFIX lib
   SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR} 
-  VERSION ${VERSION} )
+  VERSION ${VERSION}
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 
 #-------------------------------------
 # Build the documentation with ROBODoc
@@ -112,24 +114,28 @@ if ( NOT ROBODOC_SKIP_DOC_GEN )
   if ( ROBODOC ) # Found
     set ( ROBODOC_OPTIONS --tabsize 4 --index --toc --sections --syntaxcolors --source_line_numbers
       CACHE STRING "Options passed to robodoc to control building the documentation" )
-    set ( DOC_DIR "${CMAKE_BINARY_DIR}/doc" )
+    set ( DOC_DIR "${CMAKE_BINARY_DIR}/documentation" )
     set ( REQUIRED_ROBODOC_OPTIONS
       --src "${CMAKE_SOURCE_DIR}/src" --doc "${DOC_DIR}"
       --multidoc --html --ignore_case_when_linking
       --documenttitle "${CMAKE_PROJECT_NAME}" )
-    set ( ROBODOC_OUPUTS json_example_f90.html masterindex.html robo_functions.html robo_sourcefiles.html
-      toc_index.html json_module_f90.html robo_classes.html robo_modules.html robodoc.css )
-    foreach ( ARG ${ROBODOC_OUPUTS} )
-      set ( ROBO_OUTPUTS "${DOC_DIR}/${ARG}" )
-    endforeach ( ARG ${ROBODOC_OUPUTS} )
-    add_custom_command ( OUTPUT ${ROBO_OUTPUTS}
+    # Dynamically generate the ROBODoc outputs list
+    message ( STATUS "Dynamically computing ROBODoc output information..." )
+    execute_process ( COMMAND ${CMAKE_COMMAND} -E remove_directory ${DOC_DIR} 
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${DOC_DIR}
+      COMMAND "${ROBODOC}" ${REQUIRED_ROBODOC_OPTIONS} ${ROBODOC_OPTIONS} )
+    file ( GLOB_RECURSE ROBODOC_OUTPUTS
+      "${DOC_DIR}/*" )
+    execute_process ( COMMAND ${CMAKE_COMMAND} -E remove_directory ${DOC_DIR} )
+    message ( STATUS "Done dynamically computing ROBODoc outputs." )
+
+    add_custom_command ( OUTPUT ${ROBODOC_OUTPUTS}
       COMMAND "${CMAKE_COMMAND}" -E make_directory "${DOC_DIR}" # Ensure DOC_DIR exists at build time
       COMMAND "${ROBODOC}" ${REQUIRED_ROBODOC_OPTIONS} ${ROBODOC_OPTIONS}
       DEPENDS "${CMAKE_SOURCE_DIR}/${JF_LIB_SRCS}"
       COMMENT "Building HTML documentation for ${CMAKE_PROJECT_NAME} using ROBODoc" )
     add_custom_target ( documentation ALL
-      DEPENDS ${ROBO_OUTPUTS} )
-    set_directory_properties ( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES doc )
+      DEPENDS ${ROBODOC_OUTPUTS} )
   else ( ROBODOC ) # Not found
     message ( WARNING
       "ROBODoc not found! Please set the CMake cache variable ROBODOC to point to the installed ROBODoc binary, and reconfigure or disable building the documentation. ROBODoc can be installed from: http://www.xs4all.nl/~rfsber/Robo/ If you do not wish to install ROBODoc and build the json-fortran documentation, then please set the CMake cache variable SKIP_DOCUMENTATION_GENERATION to FALSE." )

README.md

@@ -37,7 +37,7 @@ environment variable `FC` to point to your Fortran compiler, and
 create a build directory. Then `(cmake-gui|ccmake|cmake)
 /path/to/json-fortran-root` to configure, `make` to build and `make
 install` to optionally install. As long as the project is built with
-CMake other CMake projects can find it and link against it:
+CMake, other CMake projects can find it and link against it:
 
 ```CMake
 cmake_minimum_required ( VERSION 2.8 FATAL_ERROR )