[certi-cvs] applications/PyHLA CMakeLists.txt doc/CMakeList...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Petr Gotthard <gotthardp>       09/07/10 17:03:40

Modified files:
        PyHLA          : CMakeLists.txt 
        PyHLA/doc      : CMakeLists.txt 

Log message:
        Patch #6862: doc cmake integrated into the mainline.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/CMakeLists.txt?cvsroot=certi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/doc/CMakeLists.txt?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- CMakeLists.txt      24 Apr 2009 09:36:38 -0000      1.8
+++ CMakeLists.txt      10 Jul 2009 17:03:40 -0000      1.9
@@ -18,8 +18,8 @@
 FIND_PACKAGE(PythonInterp REQUIRED)
 
 IF(NOT PYTHON_PACKAGES_PATH)
-    EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
-        ARGS "${CMAKE_CURRENT_SOURCE_DIR}/GetPackagesPath.py"
+    EXECUTE_PROCESS(
+        COMMAND "${PYTHON_EXECUTABLE}" 
"${CMAKE_CURRENT_SOURCE_DIR}/GetPackagesPath.py"
         OUTPUT_VARIABLE PYTHON_PACKAGES_PATH)
     MESSAGE(STATUS "Found Python modules: ${PYTHON_PACKAGES_PATH}")
     SET(PYTHON_PACKAGES_PATH "${PYTHON_PACKAGES_PATH}"
@@ -33,6 +33,7 @@
 ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 MESSAGE(STATUS "Python modules will be installed in: ${CMAKE_INSTALL_PREFIX}")
 
+ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(hla)
 ADD_SUBDIRECTORY(test)
 
@@ -63,4 +64,4 @@
 
 INCLUDE(CPack)
 
-# $Id: CMakeLists.txt,v 1.8 2009/04/24 09:36:38 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.9 2009/07/10 17:03:40 gotthardp Exp $

Index: doc/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/doc/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/CMakeLists.txt  9 Jul 2009 18:54:10 -0000       1.2
+++ doc/CMakeLists.txt  10 Jul 2009 17:03:40 -0000      1.3
@@ -1,36 +1,56 @@
+GET_FILENAME_COMPONENT(PYTHON_PREFIX "${PYTHON_PACKAGES_PATH}" PATH)
 
-get_filename_component(PYTHON_PREFIX "${PYTHON_PACKAGES_PATH}" PATH)
+# set the default PYTHON_SOURCE_DIR value
+IF(NOT PYTHON_SOURCE_DIR)
+    SET(PYTHON_SOURCE_DIR $ENV{PYTHON_SOURCE_DIR} CACHE PATH "The Python 
source directory.")
+ENDIF(NOT PYTHON_SOURCE_DIR)
 
 # e.g. Python-2.5.1/Doc/tools/mkhowto
-find_program(PYTHON_MKHOWTO mkhowto
-             PATHS ${PYTHON_PREFIX}/doc/tools
+FIND_PROGRAM(PYTHON_MKHOWTO
+    NAMES mkhowto
+    PATHS
+        ${PYTHON_PREFIX}/doc/tools
+        ${PYTHON_SOURCE_DIR}/Doc/tools
              DOC "The Python mkhowto utility") 
              
 IF (PYTHON_MKHOWTO)
 
-    add_custom_target(PyHLA.html
+    SET(MKHOWTO_SOURCES
+        PyHLA.tex
+        omt/module.tex
+        rti/module.tex
+        rti/federateambassador.tex
+        rti/rtiambassador.tex
+        rti/services.tex
+    )
+
+    ADD_CUSTOM_TARGET(PyHLA.html
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}     
         COMMAND ${PYTHON_MKHOWTO} --html --dir 
${CMAKE_CURRENT_SOURCE_DIR}/../manual PyHLA.tex
+        SOURCES ${MKHOWTO_SOURCES}
     )
 
     ADD_CUSTOM_TARGET(PyHLA.dvi
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMAND ${PYTHON_MKHOWTO} --a4 --dvi PyHLA.tex
+        SOURCES ${MKHOWTO_SOURCES}
     )
     
     # This is currently not working
-    #add_custom_target(PyHLA.pdf
+    #ADD_CUSTOM_TARGET(PyHLA.pdf
     #    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}         
     #    COMMAND ${PYTHON_MKHOWTO} --a4 --pdf PyHLA.tex
     #)
     
-    add_custom_target(PyHLA.pdf
+    ADD_CUSTOM_TARGET(PyHLA.pdf
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}         
         COMMAND dvipdf PyHLA.dvi
     )
     
-    add_dependencies(PyHLA.pdf PyHLA.dvi)
+    ADD_DEPENDENCIES(PyHLA.pdf PyHLA.dvi)
                    
 ELSE(PYTHON_MKHOWTO)
     MESSAGE("Cannot find Python mkhowto rules for generating doc not added.")
 ENDIF(PYTHON_MKHOWTO)
+
+# $Id: CMakeLists.txt,v 1.3 2009/07/10 17:03:40 gotthardp Exp $