diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-05-31 07:59:01 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-05-31 07:59:01 (GMT) |
| commit | 635d8cf30e702bdf83fe5c96452f8f863d57bdee (patch) | |
| tree | c88a62cfee260b2ff42ba00ce360d638605adf16 /addon | |
| parent | 7bcf8e9a379ec0599160e5562f07b93f8fb9557a (diff) | |
| download | Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.zip Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.tar.gz Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.tar.bz2 | |
Further cmake changes
- made static build option for all windows targets
- made wizard flex interactive
- add 64bit support for libiconv on windows build
- updated test mechanism
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/doxywizard/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | addon/doxywizard/config_doxyw.l | 3 |
2 files changed, 3 insertions, 17 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 30130af..055aac3 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -41,23 +41,6 @@ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) -if (qt_static) - set(CompilerFlags - CMAKE_CXX_FLAGS - CMAKE_CXX_FLAGS_DEBUG - CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_MINSIZEREL - CMAKE_CXX_FLAGS_RELWITHDEBINFO - CMAKE_C_FLAGS - CMAKE_C_FLAGS_DEBUG - CMAKE_C_FLAGS_RELEASE - CMAKE_C_FLAGS_MINSIZEREL - CMAKE_C_FLAGS_RELWITHDEBINFO) - foreach(CompilerFlag ${CompilerFlags}) - string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") - endforeach() -endif() - FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "-Pconfig_doxywYY") QT4_WRAP_CPP(doxywizard_MOC diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l index 6402674..3e1c59f 100644 --- a/addon/doxywizard/config_doxyw.l +++ b/addon/doxywizard/config_doxyw.l @@ -12,6 +12,7 @@ * */ +%option never-interactive %{ /* @@ -21,6 +22,8 @@ #include "input.h" #include <QtCore> +#define YY_NO_UNISTD_H 1 + #define MAX_INCLUDE_DEPTH 10 |