Print

Print


Commit in lcdd on MAIN
CMakeLists.txt+6-41.4 -> 1.5

lcdd
CMakeLists.txt 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- CMakeLists.txt	1 Jul 2013 21:51:22 -0000	1.4
+++ CMakeLists.txt	1 Jul 2013 21:55:33 -0000	1.5
@@ -83,27 +83,29 @@
 # generate package configuration
 GENERATE_PACKAGE_CONFIGURATION_FILES( LCDDConfig.cmake LCDDConfigVersion.cmake LCDDLibDeps.cmake )
 
-# Configure and output documentation using doxygen.
+# configure and output documentation using doxygen
 OPTION( INSTALL_DOC "Set to OFF to skip build/install documentation" ON ) 
 IF ( INSTALL_DOC )
     
+    # find doxygen
     FIND_PROGRAM( DOXYGEN_EXECUTABLE doxygen ${PATH} )
     IF ( DOXYGEN_EXECUTABLE-NOTFOUND )
         MESSAGE( FATAL_ERROR "The doxygen executable was not found." )
     ENDIF()
     
+    # find dot
     FIND_PROGRAM( DOT_EXECUTABLE dot ${PATH} )
     IF ( DOT_EXECUTABLE-NOTFOUND )
         MESSAGE( FATAL_ERROR "The dot executable was not found." )
     ENDIF()
     
+    # configure doxygen output
     MESSAGE( STATUS "Configuring doxygen input file" )
     CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/config/doxygen/lcdd_doxygen.cfg.in ${PROJECT_SOURCE_DIR}/config/doxygen/lcdd_doxygen.cfg )
     
-    MESSAGE( STATUS "Executing doxygen to create html documentation" )
+    # add doxygen documentation to install step
     INSTALL( CODE "EXECUTE_PROCESS( COMMAND doxygen ${PROJECT_SOURCE_DIR}/config/doxygen/lcdd_doxygen.cfg)" )
-    #EXEC_PROGRAM( doxygen ARGS ${PROJECT_SOURCE_DIR}/config/doxygen/lcdd_doxygen.cfg )        
-    #INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_BUILD_TOOL} doc)" )
 ELSE() 
+    # message that documentation is off for this build
     MESSAGE( STATUS "INSTALL_DOC is set to OFF.  Documentation will not be created." ) 
 ENDIF()                                            
\ No newline at end of file
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1