Revision: 40508
http://brlcad.svn.sourceforge.net/brlcad/?rev=40508&view=rev
Author: starseeker
Date: 2010-09-08 21:07:18 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
Don't hardcode xsltproc path - later will need to look for other alternatives
to xsltproc as well
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/misc/CMake/FindXSLT.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-08 20:08:29 UTC (rev
40507)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-08 21:07:18 UTC (rev
40508)
@@ -1120,7 +1120,16 @@
# to build (I think?)
ADD_SUBDIRECTORY(src/other/tnt)
+# If building extra docs, need to look for XSLTPROC
+if (BRLCAD-BUILD_EXTRADOCS)
+ INCLUDE(${BRLCAD_CMAKE_DIR}/FindXSLT.cmake)
+ IF(NOT XSLTPROC_EXEC)
+ MESSAGE("Extra doc build requested, but xsltproc not found -
disabling.")
+ SET(BRLCAD-BUILD_EXTRADOCS OFF)
+ ENDIF(NOT XSLTPROC_EXEC)
+endif (BRLCAD-BUILD_EXTRADOCS)
+
# Now that all the tests are done, configure the brlcad_config.h file:
configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
Modified: brlcad/branches/cmake/doc/docbook/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2010-09-08 20:08:29 UTC
(rev 40507)
+++ brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2010-09-08 21:07:18 UTC
(rev 40508)
@@ -7,8 +7,6 @@
SET(XSL_FO_STYLESHEET
"${CMAKE_SOURCE_DIR}/doc/docbook/resources/standard/xsl/fo/docbook.xsl")
SET(XML_CATALOG_FILES "${CMAKE_SOURCE_DIR}/doc/docbook/catalog.xml")
-SET(XSLTPROC_EXEC "/usr/bin/xsltproc")
-
MACRO(DOCBOOK_TO_HTML targetname_suffix xml_files targetdir)
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE "([0-9a-z_-]*).xml" "\\1" filename_root
"${filename}")
Added: brlcad/branches/cmake/misc/CMake/FindXSLT.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindXSLT.cmake
(rev 0)
+++ brlcad/branches/cmake/misc/CMake/FindXSLT.cmake 2010-09-08 21:07:18 UTC
(rev 40508)
@@ -0,0 +1,10 @@
+# - Find XSLT processor
+#
+# The following variables are set:
+#
+# XSLTPROC_EXEC
+
+FIND_PROGRAM(XSLTPROC_EXEC xsltproc DOC "path to the xsltproc executable")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XSLTPROC DEFAULT_MSG XSLTPROC_EXEC)
Property changes on: brlcad/branches/cmake/misc/CMake/FindXSLT.cmake
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
