diff options
| author | albert-github <albert.tests@gmail.com> | 2016-01-17 17:40:10 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2016-01-17 17:40:10 (GMT) |
| commit | cf1706776bd93367dd357f505d04a7b10553f65f (patch) | |
| tree | 06fe9b742d0f3aa25341bbb10a92dd638262f502 /addon | |
| parent | 41e71437484aaaece77d155fc2c4fdaf5c72c71f (diff) | |
| download | Doxygen-cf1706776bd93367dd357f505d04a7b10553f65f.zip Doxygen-cf1706776bd93367dd357f505d04a7b10553f65f.tar.gz Doxygen-cf1706776bd93367dd357f505d04a7b10553f65f.tar.bz2 | |
Building doxyapp fails after update of config methodology to improve performance
This is a regressing on the "Changed configuration mechanism to directly access options in order to improve performance ( a93ec7221d1a258f0268e0c081782478372efe0b)
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/doxyapp/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | addon/doxyapp/doxyapp.cpp | 26 |
2 files changed, 22 insertions, 13 deletions
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt index 99a6fd4..423aea6 100644 --- a/addon/doxyapp/CMakeLists.txt +++ b/addon/doxyapp/CMakeLists.txt @@ -1,9 +1,18 @@ if (build_app) +# configvalues.h +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.h +) +set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) + find_package(Iconv) include_directories( ${CMAKE_SOURCE_DIR}/src + ${GENERATED_SRC} ${CMAKE_SOURCE_DIR}/qtools ${ICONV_INCLUDE_DIR} ${CLANG_INCLUDEDIR} diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp index 6564981..45e71fc 100644 --- a/addon/doxyapp/doxyapp.cpp +++ b/addon/doxyapp/doxyapp.cpp @@ -262,28 +262,28 @@ int main(int argc,char **argv) // setup the non-default configuration options // we need a place to put intermediate files - Config_getString("OUTPUT_DIRECTORY")="/tmp/doxygen"; + Config_getString(OUTPUT_DIRECTORY)="/tmp/doxygen"; // disable html output - Config_getBool("GENERATE_HTML")=FALSE; + Config_getBool(GENERATE_HTML)=FALSE; // disable latex output - Config_getBool("GENERATE_LATEX")=FALSE; + Config_getBool(GENERATE_LATEX)=FALSE; // be quiet - Config_getBool("QUIET")=TRUE; + Config_getBool(QUIET)=TRUE; // turn off warnings - Config_getBool("WARNINGS")=FALSE; - Config_getBool("WARN_IF_UNDOCUMENTED")=FALSE; - Config_getBool("WARN_IF_DOC_ERROR")=FALSE; + Config_getBool(WARNINGS)=FALSE; + Config_getBool(WARN_IF_UNDOCUMENTED)=FALSE; + Config_getBool(WARN_IF_DOC_ERROR)=FALSE; // Extract as much as possible - Config_getBool("EXTRACT_ALL")=TRUE; - Config_getBool("EXTRACT_STATIC")=TRUE; - Config_getBool("EXTRACT_PRIVATE")=TRUE; - Config_getBool("EXTRACT_LOCAL_METHODS")=TRUE; + Config_getBool(EXTRACT_ALL)=TRUE; + Config_getBool(EXTRACT_STATIC)=TRUE; + Config_getBool(EXTRACT_PRIVATE)=TRUE; + Config_getBool(EXTRACT_LOCAL_METHODS)=TRUE; // Extract source browse information, needed // to make doxygen gather the cross reference info - Config_getBool("SOURCE_BROWSER")=TRUE; + Config_getBool(SOURCE_BROWSER)=TRUE; // set the input - Config_getList("INPUT").append(argv[1]); + Config_getList(INPUT).append(argv[1]); // check and finialize the configuration checkConfiguration(); |