Fix dblatex options within cmake file

The logic for setting the options for dblatex on the various languages
wasn't correct. The default option need to be set to an empty string
which is expanded with the additional needed options later, otherwise
previously added options won't get forgotten within the configuration
run for the next language.

Gbp-Pq: Topic fixes
Gbp-Pq: Name Fix-dblatex-options-within-cmake-file.patch

diff --git a/doc/CMakeModules/KiCadDocumentation.cmake b/doc/CMakeModules/KiCadDocumentation.cmake
index 445fd64258cd1fbdc1298730f2e311bb95d91a31..6211e892981a38f04ca857136f1a7c49bcf669c4 100644 (file)
--- a/doc/CMakeModules/KiCadDocumentation.cmake
+++ b/doc/CMakeModules/KiCadDocumentation.cmake
@@ -123,17 +123,13 @@ macro( KiCadDocumentation DOCNAME )
                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/po/${LANGUAGE}.po )
 
             # Non-ascii languages needs some special treatments
+            set(DBLATEX_OPTIONS "")
+            set_dblatex_common_options()
             if( "${LANGUAGE}" MATCHES "ja" )
-                set(DBLATEX_OPTIONS "")
-                set_dblatex_common_options()
                 add_dblatex_option( -b xetex -p ${CMAKE_CURRENT_SOURCE_DIR}/../../xsl/dblatex-pdf-ja.xsl )
             elseif( "${LANGUAGE}" MATCHES "ru" )
-                set(DBLATEX_OPTIONS "")
-                set_dblatex_common_options()
                 add_dblatex_option( -b xetex -p ${CMAKE_CURRENT_SOURCE_DIR}/../../xsl/dblatex-pdf-ru.xsl )
             elseif( "${LANGUAGE}" MATCHES "zh" )
-                set(DBLATEX_OPTIONS "")
-                set_dblatex_common_options()
                 add_dblatex_option( -b xetex -p ${CMAKE_CURRENT_SOURCE_DIR}/../../xsl/dblatex-pdf-zh.xsl )
             endif()