diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-09-12 19:16:07 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-09-12 19:16:07 (GMT) |
| commit | 3cf30e72e6b58c70c5a8330cecec4b33fa736852 (patch) | |
| tree | 8785cf8c1ffe3f5a98bc834561068d8a9ec2a070 /addon | |
| parent | 4fbb61f020a607a96152ba5c00668b9840ea812c (diff) | |
| parent | aca16ea3b4e4beef9bf067d0b532dfa3802f7a3d (diff) | |
| download | Doxygen-3cf30e72e6b58c70c5a8330cecec4b33fa736852.zip Doxygen-3cf30e72e6b58c70c5a8330cecec4b33fa736852.tar.gz Doxygen-3cf30e72e6b58c70c5a8330cecec4b33fa736852.tar.bz2 | |
Merge branch 'feature/bug_consistency_state_2' of https://github.com/albert-github/doxygen into albert-github-feature/bug_consistency_state_2
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/doxywizard/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | addon/doxywizard/config_doxyw.l | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 0347f61..6aacd8b 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -71,7 +71,17 @@ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) -FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "${LEX_FLAGS}") +set(LEX_FILES config_doxyw) +foreach(lex_file ${LEX_FILES}) + add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l + OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h + ) + set_source_files_properties(${GENERATED_SRC_WIZARD}/${lex_file}.l.h PROPERTIES GENERATED 1) + + FLEX_TARGET(${lex_file} ${lex_file}.l ${GENERATED_SRC_WIZARD}/${lex_file}.cpp COMPILE_FLAGS "${LEX_FLAGS}") +endforeach() qt_wrap_cpp(doxywizard_MOC doxywizard.h @@ -96,6 +106,7 @@ inputint.cpp inputstrlist.cpp ${GENERATED_SRC_WIZARD}/settings.h ${GENERATED_SRC_WIZARD}/config_doxyw.cpp +${GENERATED_SRC_WIZARD}/config_doxyw.l.h ${GENERATED_SRC_WIZARD}/configdoc.cpp ${doxywizard_MOC} ${doxywizard_RESOURCES_RCC} diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l index 193e6ed..59fa427 100644 --- a/addon/doxywizard/config_doxyw.l +++ b/addon/doxywizard/config_doxyw.l @@ -64,6 +64,8 @@ static QString g_codecName = QString::fromLatin1("UTF-8") static int g_lastState; static QByteArray g_tmpString; +static const char *stateToString(int state); + /* ----------------------------------------------------------------- */ #undef YY_INPUT @@ -585,4 +587,4 @@ void writeStringValue(QTextStream &t,QTextCodec *codec,const QString &s) } } } - +#include "config_doxyw.l.h" |