From 3fabcadd235e75bbfe37421a397fb85fa29a3f93 Mon Sep 17 00:00:00 2001 From: Eugene Kilachkoff Date: Mon, 29 Apr 2019 20:27:50 +0200 Subject: [PATCH] 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 --- doc/CMakeModules/KiCadDocumentation.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/CMakeModules/KiCadDocumentation.cmake b/doc/CMakeModules/KiCadDocumentation.cmake index 9ca90507..a3ae6540 100644 --- a/doc/CMakeModules/KiCadDocumentation.cmake +++ b/doc/CMakeModules/KiCadDocumentation.cmake @@ -124,17 +124,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() -- 2.30.2