Permalink
Browse files

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
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed May 31, 2015
1 parent 7bcf8e9 commit 635d8cf30e702bdf83fe5c96452f8f863d57bdee
Showing with 204 additions and 272 deletions.
  1. +19 −2 CMakeLists.txt
  2. +0 −17 addon/doxywizard/CMakeLists.txt
  3. +3 −0 addon/doxywizard/config_doxyw.l
  4. +19 −8 cmake/FindIconv.cmake
  5. +6 −4 cmake/version.cmake
  6. +2 −0 src/xmlcode.l
  7. +2 −2 src/xmlgen.cpp
  8. +1 −1 testing/009/class_bug.xml
  9. +1 −1 testing/009/class_deprecated.xml
  10. +1 −1 testing/009/class_reminder.xml
  11. +1 −1 testing/009/class_test.xml
  12. +1 −1 testing/009/class_todo.xml
  13. +1 −1 testing/011/category_integer_07_arithmetic_08.xml
  14. +2 −2 testing/011/interface_integer.xml
  15. +1 −1 testing/012_cite.dox
  16. +1 −1 testing/013/class_t1.xml
  17. +1 −1 testing/013/class_t2.xml
  18. +1 −1 testing/013/class_t3.xml
  19. +1 −1 testing/013/class_t4.xml
  20. +1 −1 testing/015/015__cond_8c.xml
  21. +5 −5 testing/018/018__def_8c.xml
  22. +0 −1 testing/021_dontinclude.cpp
  23. +2 −2 testing/025/class_test.xml
  24. +1 −1 testing/025_example.cpp
  25. +1 −1 testing/026/class_test.xml
  26. +2 −2 testing/027/struct_car.xml
  27. +2 −2 testing/027/struct_object.xml
  28. +2 −2 testing/027/struct_truck.xml
  29. +2 −2 testing/027/struct_vehicle.xml
  30. +2 −2 testing/029/029__hideinit_8c.xml
  31. +0 −1 testing/030_htmlinclude.dox
  32. +0 −1 testing/032_include.cpp
  33. +1 −1 testing/035/035__invariant_8c.xml
  34. +1 −1 testing/037/class_receiver.xml
  35. +1 −1 testing/037/class_sender.xml
  36. +1 −1 testing/039/class_test.xml
  37. +4 −4 testing/041/class_test.xml
  38. +7 −7 testing/044/struct_s.xml
  39. +1 −1 testing/046/class_test.xml
  40. +2 −2 testing/048/048__showinit_8c.xml
  41. +0 −1 testing/049_snippet.cpp
  42. +0 −1 testing/050_verbatim.dox
  43. +0 −1 testing/056_latexinclude.dox
  44. +5 −5 testing/057/057__caller__graphs_8tcl.xml
  45. +1 −1 testing/057/__057__caller__graphs_8tcl.xml
  46. +7 −7 testing/057/namespace1.xml
  47. +1 −1 testing/057/namespace1_1_11.xml
  48. +1 −1 testing/057/namespace1_1_11_1_11.xml
  49. +1 −1 testing/057/namespace2.xml
  50. +1 −1 testing/057/namespace2_1_12.xml
  51. +1 −1 testing/057/namespace2_1_12_1_12.xml
  52. +1 −1 testing/057/namespace2_1_12_1_12_1_12.xml
  53. +1 −1 testing/057/namespace2_1_12_1_12_1_12_1_12.xml
  54. +3 −3 testing/057/namespacebar.xml
  55. +1 −1 testing/057/namespacefoo.xml
  56. +1 −1 testing/057_caller_graphs.tcl
  57. +25 −25 testing/058/058__bracket__recursion_8tcl.xml
  58. +12 −12 testing/059/059__command__catch_8tcl.xml
  59. +21 −21 testing/060/060__command__switch_8tcl.xml
  60. +4 −4 testing/061/class_test.xml
  61. +2 −2 testing/062/namespacen1.xml
  62. +2 −2 testing/062/namespacen2.xml
  63. +2 −2 testing/062/namespacen3.xml
  64. +1 −1 testing/063/namespaceoo_1_1_helpers.xml
  65. +1 −1 testing/063/namespaceoo_1_1define.xml
  66. +1 −1 testing/064/struct_foo.xml
  67. +5 −56 testing/CMakeLists.txt
  68. +1 −1 testing/Makefile
  69. +0 −29 testing/test_driver.cmake
View
@@ -21,7 +21,7 @@ option(build_search "Build external search tools (doxysearch and doxyindexer)
option(build_doc "Build user manual" OFF)
option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF)
option(use_libclang "Add support for libclang parsing." OFF)
option(qt_static "Link doxywizard with /MT in stead of /MD on windows" OFF)
option(win_static "Link with /MT in stead of /MD on windows" OFF)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(version)
@@ -36,7 +36,6 @@ if (use_libclang)
find_package(LibClang REQUIRED)
endif()
if (${CMAKE_SYSTEM} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_CXX_FLAGS}")
find_library(CORESERVICES_LIB CoreServices)
@@ -81,6 +80,24 @@ if (${CUSTOM_LINK_DIR})
link_directories(${CUSTOM_LINK_DIR})
endif()
if (win_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()
add_subdirectory(libmd5)
add_subdirectory(qtools)
add_subdirectory(vhdlparser)
@@ -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
@@ -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
View
@@ -45,14 +45,25 @@ if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND")
endif()
if(NOT ICONV_IN_GLIBC)
find_library(ICONV_LIBRARY
NAMES iconv
HINTS
${CMAKE_PREFIX_PATH}
${ICONV_DIR}
$ENV{ICONV_DIR}
PATH_SUFFIXES lib64 lib
)
if (CMAKE_CL_64)
find_library(ICONV_LIBRARY
NAMES iconv64
HINTS
${CMAKE_PREFIX_PATH}
${ICONV_DIR}
$ENV{ICONV_DIR}
PATH_SUFFIXES lib64 lib
)
else()
find_library(ICONV_LIBRARY
NAMES iconv
HINTS
${CMAKE_PREFIX_PATH}
${ICONV_DIR}
$ENV{ICONV_DIR}
PATH_SUFFIXES lib64 lib
)
endif()
set(ICONV_TEST ${ICONV_LIBRARY})
else()
set(ICONV_TEST "In glibc")
View
@@ -1,6 +1,8 @@
set(doxygen_version_major "1" CACHE STRING "Major")
set(doxygen_version_minor "8" CACHE STRING "Minor")
set(doxygen_version_revision "8" CACHE STRING "Revision")
file (STRINGS "VERSION" VERSION)
#string(REGEX MATCH "([0-9]+).([0-9]+).([0-9]+)" ${doxygen_version_major} ${doxygen_version_minor} ${doxygen_version_revision} )
#set(doxygen_version_major "1" CACHE STRING "Major")
#set(doxygen_version_minor "8" CACHE STRING "Minor")
#set(doxygen_version_revision "9.1" CACHE STRING "Revision")
#set(doxygen_version_mmn "-5" CACHE STRING "Mmn")
set(VERSION "${doxygen_version_major}.${doxygen_version_minor}.${doxygen_version_revision}${doxygen_version_mmn}")
#set(VERSION "${doxygen_version_major}.${doxygen_version_minor}.${doxygen_version_revision}${doxygen_version_mmn}")
set(ENV{VERSION} "${VERSION}")
View
@@ -17,6 +17,7 @@
* written by Weston Thayer
******************************************************************************/
%option never-interactive
%{
#include <stdio.h>
@@ -35,6 +36,7 @@
#define YY_NEVER_INTERACTIVE 1
#define YY_NO_INPUT 1
#define YY_NO_UNISTD_H 1
static CodeOutputInterface * g_code;
static QCString g_curClassName;
View
@@ -986,7 +986,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
FileDef *bodyDef = md->getBodyDef();
if (bodyDef)
{
t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
}
t << " bodystart=\"" << md->getStartBodyLine() << "\" bodyend=\""
<< md->getEndBodyLine() << "\"";
@@ -1412,7 +1412,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti)
FileDef *bodyDef = cd->getBodyDef();
if (bodyDef)
{
t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
}
t << " bodystart=\"" << cd->getStartBodyLine() << "\" bodyend=\""
<< cd->getEndBodyLine() << "\"";
@@ -32,7 +32,7 @@
</xrefsect>
</para>
</detaileddescription>
<location file="009_bug.cpp" bodystart="15" bodyend="26"/>
<location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/>
<listofallmembers>
<member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual">
<scope>Bug</scope>
@@ -30,7 +30,7 @@
</xrefsect>
</para>
</detaileddescription>
<location file="009_bug.cpp" bodystart="29" bodyend="36"/>
<location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/>
<listofallmembers>
<member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual">
<scope>Deprecated</scope>
@@ -37,7 +37,7 @@
</xrefsect>
</para>
</detaileddescription>
<location file="009_bug.cpp" bodystart="55" bodyend="60"/>
<location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/>
<listofallmembers>
<member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual">
<scope>Reminder</scope>
@@ -37,7 +37,7 @@
</xrefsect>
</para>
</detaileddescription>
<location file="009_bug.cpp" bodystart="47" bodyend="52"/>
<location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/>
<listofallmembers>
<member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual">
<scope>Test</scope>
@@ -37,7 +37,7 @@
</xrefsect>
</para>
</detaileddescription>
<location file="009_bug.cpp" bodystart="39" bodyend="44"/>
<location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/>
<listofallmembers>
<member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual">
<scope>Todo</scope>
@@ -45,7 +45,7 @@
<detaileddescription>
<para>A category </para>
</detaileddescription>
<location file="011_category.m" bodystart="17" bodyend="-1"/>
<location file="011_category.m" line="17" column="1" bodyfile="011_category.m" bodystart="17" bodyend="-1"/>
<listofallmembers>
<member refid="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" virt="virtual">
<scope>Integer(Arithmetic)</scope>
@@ -16,7 +16,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="011_category.m" bodystart="8" bodyend="-1"/>
<location file="011_category.m" line="8" column="1" bodyfile="011_category.m" bodystart="8" bodyend="-1"/>
</memberdef>
</sectiondef>
<sectiondef kind="public-func">
@@ -80,7 +80,7 @@
</childnode>
</node>
</collaborationgraph>
<location file="011_category.m" bodystart="6" bodyend="-1"/>
<location file="011_category.m" line="6" column="1" bodyfile="011_category.m" bodystart="6" bodyend="-1"/>
<listofallmembers>
<member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual">
<scope>Integer</scope>
View
@@ -1,7 +1,7 @@
// objective: test the \cite command
// check: indexpage.xml
// check: citelist.xml
// config: CITE_BIB_FILES = sample.bib
// config: CITE_BIB_FILES = $INPUTDIR/sample.bib
/** \mainpage
* See \cite knuth79 for more info.
*/
View
@@ -8,7 +8,7 @@
<detaileddescription>
<para>A class </para>
</detaileddescription>
<location file="013_class.h" bodystart="10" bodyend="12"/>
<location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/>
<listofallmembers>
</listofallmembers>
</compounddef>
View
@@ -8,7 +8,7 @@
<detaileddescription>
<para>class <ref refid="class_t2" kindref="compound">T2</ref> </para>
</detaileddescription>
<location file="013_class.h" bodystart="14" bodyend="16"/>
<location file="013_class.h" line="15" column="1" bodyfile="013_class.h" bodystart="14" bodyend="16"/>
<listofallmembers>
</listofallmembers>
</compounddef>
View
@@ -8,7 +8,7 @@
<detaileddescription>
<para>class <ref refid="class_t3" kindref="compound">T3</ref> </para>
</detaileddescription>
<location file="013_class.h" bodystart="18" bodyend="20"/>
<location file="013_class.h" line="19" column="1" bodyfile="013_class.h" bodystart="18" bodyend="20"/>
<listofallmembers>
</listofallmembers>
</compounddef>
View
@@ -8,7 +8,7 @@
<detaileddescription>
<para>class <ref refid="class_t4" kindref="compound">T4</ref> </para>
</detaileddescription>
<location file="013_class.h" bodystart="22" bodyend="24"/>
<location file="013_class.h" line="23" column="1" bodyfile="013_class.h" bodystart="22" bodyend="24"/>
<listofallmembers>
</listofallmembers>
</compounddef>
@@ -14,7 +14,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="015_cond.c" bodystart="20" bodyend="22"/>
<location file="015_cond.c" line="20" column="1" bodyfile="015_cond.c" bodystart="20" bodyend="22"/>
</memberdef>
</sectiondef>
<briefdescription>
@@ -40,7 +40,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="018_def.c" bodystart="13" bodyend="13"/>
<location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/>
</memberdef>
</sectiondef>
<sectiondef kind="typedef">
@@ -56,7 +56,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="018_def.c" bodystart="12" bodyend="-1"/>
<location file="018_def.c" line="12" column="1" bodyfile="018_def.c" bodystart="12" bodyend="-1"/>
</memberdef>
</sectiondef>
<sectiondef kind="var">
@@ -73,7 +73,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="018_def.c" bodystart="9" bodyend="-1"/>
<location file="018_def.c" line="9" column="1" bodyfile="018_def.c" bodystart="9" bodyend="-1"/>
</memberdef>
</sectiondef>
<sectiondef kind="func">
@@ -92,7 +92,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="018_def.c" bodystart="10" bodyend="10"/>
<location file="018_def.c" line="10" column="1" bodyfile="018_def.c" bodystart="10" bodyend="10"/>
</memberdef>
<memberdef kind="function" id="018__def_8c_1a2652ccbfb85efa2df3c70ba6c4628f8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
<type>void</type>
@@ -112,7 +112,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="018_def.c" bodystart="11" bodyend="11"/>
<location file="018_def.c" line="11" column="1" bodyfile="018_def.c" bodystart="11" bodyend="11"/>
</memberdef>
</sectiondef>
<briefdescription>
@@ -1,6 +1,5 @@
// objective: test the \dontinclude, \skip, \until, \skipline, \line commands
// check: indexpage.xml
// config: EXAMPLE_PATH = .
/*! A test class. */
class Test
@@ -16,7 +16,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="025_example.cpp" bodystart="20" bodyend="20"/>
<location file="025_example.cpp" line="17" column="1" bodyfile="025_example.cpp" bodystart="20" bodyend="20"/>
</memberdef>
</sectiondef>
<briefdescription>
@@ -25,7 +25,7 @@
<detaileddescription>
<para>More details about this class. </para>
</detaileddescription>
<location file="025_example.cpp" bodystart="10" bodyend="18"/>
<location file="025_example.cpp" line="11" column="1" bodyfile="025_example.cpp" bodystart="10" bodyend="18"/>
<listofallmembers>
<member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual">
<scope>Test</scope>
View
@@ -1,7 +1,7 @@
// objective: test the \example command
// check: example_test_8cpp-example.xml
// check: class_test.xml
// config: EXAMPLE_PATH = .
/** \brief A Test class.
*
@@ -41,7 +41,7 @@
<para>A <ref refid="class_test" kindref="compound">Test</ref> class. More details about this class. <parameterlist kind="templateparam"><parameteritem><parameternamelist><parametername>T</parametername></parameternamelist><parameterdescription><para>A template parameter. </para></parameterdescription></parameteritem></parameterlist>
</para>
</detaileddescription>
<location file="026_exception.cpp" bodystart="8" bodyend="20"/>
<location file="026_exception.cpp" line="9" column="1" bodyfile="026_exception.cpp" bodystart="8" bodyend="20"/>
<listofallmembers>
<member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual">
<scope>Test</scope>
@@ -18,7 +18,7 @@
</detaileddescription>
<inbodydescription>
</inbodydescription>
<location file="027_extends.c" bodystart="69" bodyend="-1"/>
<location file="027_extends.c" line="69" column="1" bodyfile="027_extends.c" bodystart="69" bodyend="-1"/>
</memberdef>
</sectiondef>
<briefdescription>
@@ -68,7 +68,7 @@
</childnode>
</node>
</collaborationgraph>
<location file="027_extends.c" bodystart="67" bodyend="70"/>
<location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/>
<listofallmembers>
<member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual">
<scope>Car</scope>
Oops, something went wrong.

0 comments on commit 635d8cf

Please sign in to comment.