summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-08-21 09:11:55 (GMT)
committerGitHub <noreply@github.com>2017-08-21 09:11:55 (GMT)
commited0cbce6f9902f3f4bb84f37e20bd3096c911a33 (patch)
tree0b03cdfb87a542dc4e5d00633c44738fb83a5f7c
parentfa602a36881e1fe063564be8a1c03978bf7acbef (diff)
parentcc3a9e611c15f32ae4913a87306699db60758245 (diff)
downloadDoxygen-ed0cbce6f9902f3f4bb84f37e20bd3096c911a33.zip
Doxygen-ed0cbce6f9902f3f4bb84f37e20bd3096c911a33.tar.gz
Doxygen-ed0cbce6f9902f3f4bb84f37e20bd3096c911a33.tar.bz2
Merge pull request #574 from brgl/fix_buildroot_build
build: fix the way lang_cfg.h is generated
-rw-r--r--cmake/lang_cfg.cmake10
-rw-r--r--src/CMakeLists.txt2
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake
index c57d3ed..86c2d9a 100644
--- a/cmake/lang_cfg.cmake
+++ b/cmake/lang_cfg.cmake
@@ -1,10 +1,10 @@
-if(${CMAKE_ARGC} GREATER 1)
- if ("${CMAKE_ARGV3}" STREQUAL "ENONLY")
- message("#define ENGLISH_ONLY")
+if(${CMAKE_ARGC} GREATER 2)
+ if ("${CMAKE_ARGV4}" STREQUAL "ENONLY")
+ file(APPEND ${CMAKE_ARGV3} " #define ENGLISH_ONLY")
else()
math(EXPR UPTO ${CMAKE_ARGC}-1)
- foreach(i RANGE 3 ${UPTO})
- message("#define LANG_${CMAKE_ARGV${i}}")
+ foreach(i RANGE 4 ${UPTO})
+ file(APPEND ${CMAKE_ARGV3} " #define LANG_${CMAKE_ARGV${i}}")
endforeach()
endif()
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be395f4..2218e82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
# lang_cfg.h
add_custom_command(
COMMENT "Generating ${GENERATED_SRC}/lang_cfg.h"
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${GENERATED_SRC}/lang_cfg.h ${LANG_CODES}
DEPENDS ${LANGUAGE_FILES}
OUTPUT ${GENERATED_SRC}/lang_cfg.h
)