Skip to content

Commit 364297f

Browse files
author
jef
committed
txt2tags should have been optional
git-svn-id: http://svn.osgeo.org/qgis/trunk@15375 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7de1303 commit 364297f

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

cmake/Txt2Tags.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ MACRO(FIND_TXT2TAGS)
2424
ENDMACRO(FIND_TXT2TAGS)
2525

2626
MACRO(ADD_TXT2TAGS_FILES _sources)
27-
FIND_TXT2TAGS()
28-
2927
FOREACH (_current_FILE ${ARGN})
3028
GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
3129
GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)

doc/CMakeLists.txt

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
INCLUDE(Txt2Tags)
2-
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
3-
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
2+
FIND_TXT2TAGS()
3+
4+
IF(TXT2TAGS_EXECUTABLE)
5+
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
6+
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
7+
ELSE(TXT2TAGS_EXECUTABLE)
8+
SET(QGIS_DOC_FILES
9+
${CMAKE_SOURCE_DIR}/INSTALL
10+
${CMAKE_SOURCE_DIR}/CODING
11+
)
12+
ENDIF(TXT2TAGS_EXECUTABLE)
413

5-
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
14+
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
615

716
INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
817
INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

0 commit comments

Comments
 (0)