txt2tags should have been optional

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15375 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 6, 2011 · 8742876 · 8742876
1 parent 3875256
commit 8742876
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cmake/Txt2Tags.cmake b/cmake/Txt2Tags.cmake
@@ -24,8 +24,6 @@ MACRO(FIND_TXT2TAGS)
 ENDMACRO(FIND_TXT2TAGS)
 
 MACRO(ADD_TXT2TAGS_FILES _sources)
-  FIND_TXT2TAGS()
-
   FOREACH (_current_FILE ${ARGN})
     GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
     GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,8 +1,17 @@
 INCLUDE(Txt2Tags)
-ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
+FIND_TXT2TAGS()
+
+IF(TXT2TAGS_EXECUTABLE)
+  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
+  ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
+ELSE(TXT2TAGS_EXECUTABLE)
+  SET(QGIS_DOC_FILES
+    ${CMAKE_SOURCE_DIR}/INSTALL 
+    ${CMAKE_SOURCE_DIR}/CODING
+  )
+ENDIF(TXT2TAGS_EXECUTABLE)
 
-ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
 
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)