[QGIS Commit] r15375 - in trunk/qgis: cmake doc

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-06 15:15:18 -0800 (Sun, 06 Mar 2011)
New Revision: 15375

Modified:
   trunk/qgis/cmake/Txt2Tags.cmake
   trunk/qgis/doc/CMakeLists.txt
Log:
txt2tags should have been optional

Modified: trunk/qgis/cmake/Txt2Tags.cmake
===================================================================
--- trunk/qgis/cmake/Txt2Tags.cmake	2011-03-06 20:38:36 UTC (rev 15374)
+++ trunk/qgis/cmake/Txt2Tags.cmake	2011-03-06 23:15:18 UTC (rev 15375)
@@ -24,8 +24,6 @@
 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)

Modified: trunk/qgis/doc/CMakeLists.txt
===================================================================
--- trunk/qgis/doc/CMakeLists.txt	2011-03-06 20:38:36 UTC (rev 15374)
+++ trunk/qgis/doc/CMakeLists.txt	2011-03-06 23:15:18 UTC (rev 15375)
@@ -1,9 +1,18 @@
 INCLUDE(Txt2Tags)
-ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
+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)
+
 SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
 
-ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
-
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)