[Plplot-cvs] SF.net SVN: plplot:[12501] trunk/doc/docbook/src/CMakeLists.txt

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

Revision: 12501
          http://sourceforge.net/p/plplot/code/12501
Author:   airwin
Date:     2013-08-30 19:13:41 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
CMake code fixups.

Move creation of jadetex.cfg from a place that is always executed
to the appropriate Boolean block.

Do not remove info directory that is initially created at cmake time.
This solves a bug when the info target is reinvoked at make time after
a change to the docbook source.

Specifically ignore environment variable DESTDIR when xmlto --with-fop
is invoked.  This works around a bug in xmlto which (on Debian at
least) craps out when DESTDIR is specified.

Tested by: Alan W. Irwin <ai...@us...> using the
-DBUILD_DOC=ON -DBUILD_DOX_DOC=ON cmake options and the install
target invoked in the following ways:

make -j4 install
make DESTDIR=whatever -j4 install

Modified Paths:
--------------
    trunk/doc/docbook/src/CMakeLists.txt

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2013-08-30 16:41:29 UTC (rev 12500)
+++ trunk/doc/docbook/src/CMakeLists.txt	2013-08-30 19:13:41 UTC (rev 12501)
@@ -71,13 +71,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/math.ent
   )
 
-execute_process(
-  COMMAND
-  ${CMAKE_COMMAND} -E copy_if_different 
-  ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
-  ${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
-  )
-
 if(
     PREBUILT_DOC
     AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
@@ -247,7 +240,6 @@
 	-E chdir ${INFO_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
 	COMMAND mv
 	${INFO_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
-	COMMAND rmdir ${INFO_TMPDIR}
 	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
 	)
 
@@ -398,13 +390,16 @@
 
 	add_custom_command(
 	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
-	  COMMAND ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} ps ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+	  # xmlto --with-fop is currently (at least on Debian) craps out
+          # if DESTDIR is specified so make sure it is NOT specified.
+	  COMMAND env DESTDIR= ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} ps ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
 	  COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.ps ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps
 	  COMMAND ${GZIP} -f ${BASE}.ps
 	  DEPENDS
 	  ${SOURCE_FILES} 
 	  ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
 	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+	  VERBATIM
 	  )
 	add_custom_target(
 	  ps_target ALL 
@@ -425,12 +420,15 @@
 
 	add_custom_command(
 	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
-	  COMMAND ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} pdf ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+	  # xmlto --with-fop is currently (at least on Debian) craps out
+          # if DESTDIR is specified so make sure it is NOT specified.
+	  COMMAND env DESTDIR= ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} pdf ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
 	  COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
 	  DEPENDS
 	  ${SOURCE_FILES} 
 	  ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
 	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+          VERBATIM
 	  )
 	add_custom_target(
 	  pdf_target ALL 
@@ -519,6 +517,13 @@
 	  ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
 	  )
 
+	execute_process(
+	  COMMAND
+	  ${CMAKE_COMMAND} -E copy_if_different 
+	  ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
+	  ${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
+	  )
+
 	# Custom commands for building print version of documentation
 	add_custom_command(
 	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex

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