From 5d0d12c0bd7f85fa0148855212f27e9adbf5975c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Fri, 26 Sep 2008 16:17:04 +0200 Subject: [PATCH] Updated cmake ragel rules to build config parser with -T0 instead of -T1 --- cmake/FindRagel.cmake | 22 +++++++++++++--------- src/CMakeLists.txt | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cmake/FindRagel.cmake b/cmake/FindRagel.cmake index 689bf03..c392c83 100644 --- a/cmake/FindRagel.cmake +++ b/cmake/FindRagel.cmake @@ -23,15 +23,19 @@ IF(RAGEL_FOUND) ENDIF(NOT RAGEL_FLAGS) MACRO(RAGEL_PARSER SRCFILE) - GET_FILENAME_COMPONENT(SRCBASE "${SRCFILE}" NAME_WE) - SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/${SRCBASE}.c") - SET(INFILE "${CMAKE_CURRENT_SOURCE_DIR}/${SRCFILE}") - ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILE} - COMMAND "${RAGEL_EXECUTABLE}" - ARGS -C ${RAGEL_FLAGS} -o "${OUTFILE}" "${INFILE}" - DEPENDS "${INFILE}" - COMMENT "Generating ${SRCBASE}.c from ${SRCFILE}" - ) + GET_FILENAME_COMPONENT(SRCBASE "${SRCFILE}" NAME_WE) + SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/${SRCBASE}.c") + SET(INFILE "${CMAKE_CURRENT_SOURCE_DIR}/${SRCFILE}") + SET(_flags ${ARGV1}) + IF(NOT _flags) + SET(_flags ${RAGEL_FLAGS}) + ENDIF(NOT _flags) + ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILE} + COMMAND "${RAGEL_EXECUTABLE}" + ARGS -C ${_flags} -o "${OUTFILE}" "${INFILE}" + DEPENDS "${INFILE}" + COMMENT "Generating ${SRCBASE}.c from ${SRCFILE}" + ) ENDMACRO(RAGEL_PARSER) ELSE(RAGEL_FOUND) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3483024..0416970 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -306,7 +306,7 @@ ENDIF(WITH_LUA) ## Build parsers by using ragel... RAGEL_PARSER(condition_parsers.rl) -RAGEL_PARSER(config_parser.rl) +RAGEL_PARSER(config_parser.rl -T0) RAGEL_PARSER(http_request_parser.rl) RAGEL_PARSER(url_parser.rl)