Skip to content

Commit

Permalink
Building doxyapp fails after update of config methodology to improve …
Browse files Browse the repository at this point in the history
…performance

This is a regressing on the "Changed configuration mechanism to directly access options in order to improve performance ( a93ec72)
  • Loading branch information
albert-github committed Jan 17, 2016
1 parent 41e7143 commit cf17067
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 13 deletions.
9 changes: 9 additions & 0 deletions 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}
Expand Down
26 changes: 13 additions & 13 deletions addon/doxyapp/doxyapp.cpp
Expand Up @@ -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();
Expand Down

0 comments on commit cf17067

Please sign in to comment.