Skip to content

Commit 32801ed

Browse files
committedMay 27, 2011
make pdf generation for txt2tags doc optional
1 parent b74a515 commit 32801ed

File tree

3 files changed

+42
-27
lines changed

3 files changed

+42
-27
lines changed
 

‎CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ ENDIF (WITH_GRASS)
5757
# mapserver by us disabled default because it needs FastCGI (which is optional dependency)
5858
SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
5959

60-
# include doxygen documentation
61-
SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
62-
6360
# build our version of astyle
6461
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
6562

‎cmake/Txt2Tags.cmake

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ MACRO(FIND_TXT2TAGS)
2121
MESSAGE(STATUS "txt2tags not found - disabled")
2222
ENDIF (NOT TXT2TAGS_EXECUTABLE)
2323
ENDIF(NOT TXT2TAGS_EXECUTABLE)
24-
IF (NOT PDFLATEX_EXECUTABLE)
25-
FIND_PROGRAM(PDFLATEX_EXECUTABLE pdflatex)
26-
ENDIF (NOT PDFLATEX_EXECUTABLE)
27-
IF (NOT PDFLATEX_EXECUTABLE)
28-
MESSAGE(STATUS "pdflatex not found - disabled")
29-
ENDIF(NOT PDFLATEX_EXECUTABLE)
24+
25+
IF (WITH_TXT2TAGS_PDF)
26+
IF (NOT PDFLATEX_EXECUTABLE)
27+
FIND_PROGRAM(PDFLATEX_EXECUTABLE pdflatex)
28+
ENDIF (NOT PDFLATEX_EXECUTABLE)
29+
IF (NOT PDFLATEX_EXECUTABLE)
30+
MESSAGE(ERROR "pdflatex not found - txt2tags documention pdf cannot be generated")
31+
ENDIF(NOT PDFLATEX_EXECUTABLE)
32+
ENDIF(WITH_TXT2TAGS_PDF)
3033
ENDMACRO(FIND_TXT2TAGS)
3134

3235
MACRO(ADD_TXT2TAGS_FILES _sources)
@@ -53,25 +56,31 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
5356
)
5457

5558
SET(${_sources} ${${_sources}} ${_out} ${_out}.html)
59+
ENDFOREACH (_current_FILE)
60+
ENDMACRO(ADD_TXT2TAGS_FILES)
5661

57-
IF (PDFLATEX_EXECUTABLE)
58-
ADD_CUSTOM_COMMAND(
59-
OUTPUT ${_out}.tex
60-
COMMAND ${TXT2TAGS_EXECUTABLE}
61-
ARGS -o${_out}.tex -t tex ${_in}
62-
DEPENDS ${_in}
63-
COMMENT "Building ${_out}.tex from ${_in}"
64-
)
62+
MACRO(ADD_TXT2TAGS_PDFS _sources)
63+
FOREACH (_current_FILE ${ARGN})
64+
GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
65+
GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
6566

66-
ADD_CUSTOM_COMMAND(
67-
OUTPUT ${_out}.pdf
68-
COMMAND TEXINPUTS=.:${CMAKE_CURRENT_SOURCE_DIR}: ${PDFLATEX_EXECUTABLE}
69-
ARGS -output-directory=${CMAKE_CURRENT_BINARY_DIR} ${_out}.tex
70-
DEPENDS ${_out}.tex
71-
COMMENT "Building ${_out}.pdf from ${_out}.tex"
72-
)
73-
SET(${_sources} ${${_sources}} ${_out}.pdf)
74-
ENDIF (PDFLATEX_EXECUTABLE)
67+
SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename})
7568

69+
ADD_CUSTOM_COMMAND(
70+
OUTPUT ${_out}.tex
71+
COMMAND ${TXT2TAGS_EXECUTABLE}
72+
ARGS -o${_out}.tex -t tex ${_in}
73+
DEPENDS ${_in}
74+
COMMENT "Building ${_out}.tex from ${_in}"
75+
)
76+
77+
ADD_CUSTOM_COMMAND(
78+
OUTPUT ${_out}.pdf
79+
COMMAND TEXINPUTS=.:${CMAKE_CURRENT_SOURCE_DIR}: ${PDFLATEX_EXECUTABLE}
80+
ARGS -output-directory=${CMAKE_CURRENT_BINARY_DIR} ${_out}.tex
81+
DEPENDS ${_out}.tex
82+
COMMENT "Building ${_out}.pdf from ${_out}.tex"
83+
)
84+
SET(${_sources} ${${_sources}} ${_out}.pdf)
7685
ENDFOREACH (_current_FILE)
77-
ENDMACRO(ADD_TXT2TAGS_FILES)
86+
ENDMACRO(ADD_TXT2TAGS_PDFS)

‎doc/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1+
# include doxygen documentation
2+
SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
3+
4+
# include doxygen documentation
5+
SET (WITH_TXT2TAGS_PDF FALSE CACHE BOOL "Determines whether PDF should be generate for the txt2tags documentation")
6+
17
INCLUDE(Txt2Tags)
28
FIND_TXT2TAGS()
39

410
IF(TXT2TAGS_EXECUTABLE)
511
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
12+
IF(WITH_TXT2TAGS_PDF)
13+
ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
14+
ENDIF(WITH_TXT2TAGS_PDF)
615
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
716
ELSE(TXT2TAGS_EXECUTABLE)
817
SET(QGIS_DOC_FILES

0 commit comments

Comments
 (0)
Please sign in to comment.