mirror of
https://github.com/conan-io/conan-center-index.git
synced 2025-05-11 21:10:49 +00:00
Doxygen: stop maintaining old versions, align around version 1.12.0 (#25928)
- Stop publishing revisions for older versions - Use version range elswhere when requiring doxygen - Use cmake_additional_variables_prefixes to handle iconv instead of patching - Add version 1.12.0 - Minor maintenance fixes
This commit is contained in:
@ -59,6 +59,7 @@ Version ranges for the following dependencies will be accepted in pull requests:
|
||||
* OpenSSL: `[>=1.1 <4]` for libraries known to be compatible with OpenSSL 1.x and 3.x
|
||||
* CMake: `[>3.XX <4]`, where `3.XX` is the minimum version of CMake required by the relevant build scripts. Note that CCI recipes assume 3.15 is installed in the system, so add this
|
||||
version range only when a requirement for a newer version is needed.
|
||||
* doxygen: `[>=1.8 <2]`
|
||||
* Libcurl: `[>=7.78 <9]`
|
||||
* Zlib: `[>=1.2.11 <2]`
|
||||
* Libpng: `[>=1.6 <2]`
|
||||
|
@ -1,63 +1,13 @@
|
||||
sources:
|
||||
"1.12.0":
|
||||
url: "https://github.com/doxygen/doxygen/releases/download/Release_1_12_0/doxygen-1.12.0.src.tar.gz"
|
||||
sha256: "a3a3dba2018ef409d83d81a2fc42a0d19bdbe087252ef342bf214b51b8b01634"
|
||||
"1.9.4":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.4.src.tar.gz"
|
||||
sha256: "a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37"
|
||||
"1.9.2":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.2.src.tar.gz"
|
||||
sha256: "060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5"
|
||||
"1.9.1":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.1.src.tar.gz"
|
||||
sha256: "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1"
|
||||
"1.8.20":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.20.src.tar.gz"
|
||||
sha256: "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec"
|
||||
"1.8.18":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.18.src.tar.gz"
|
||||
sha256: "18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656"
|
||||
"1.8.17":
|
||||
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.17.src.tar.gz"
|
||||
sha256: "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599"
|
||||
patches:
|
||||
"1.9.4":
|
||||
- patch_file: "patches/1.9.4-0001-enable-modern-compilers.patch"
|
||||
patch_description: "Enable modern compilers"
|
||||
patch_type: "portability"
|
||||
patch_source: "https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa"
|
||||
- patch_file: "patches/1.9.4-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
"1.9.2":
|
||||
- patch_file: "patches/1.9.2-0001-imported-target.patch"
|
||||
patch_description: "Fix includes"
|
||||
patch_type: "portability"
|
||||
- patch_file: "patches/1.9.2-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
"1.9.1":
|
||||
- patch_file: "patches/1.9.1-0001-imported-target.patch"
|
||||
patch_description: "Fix includes"
|
||||
patch_type: "portability"
|
||||
- patch_file: "patches/1.9.1-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
"1.8.20":
|
||||
- patch_file: "patches/1.8-0001-xapian.patch"
|
||||
patch_description: "Fix xapian find_package command"
|
||||
patch_type: "portability"
|
||||
- patch_file: "patches/1.8.20-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
"1.8.18":
|
||||
- patch_file: "patches/1.8-0001-xapian.patch"
|
||||
patch_description: "Fix xapian find_package command"
|
||||
patch_type: "portability"
|
||||
- patch_file: "patches/1.8.18-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
"1.8.17":
|
||||
- patch_file: "patches/1.8-0001-xapian.patch"
|
||||
patch_description: "Fix xapian find_package command"
|
||||
patch_type: "portability"
|
||||
- patch_file: "patches/1.8.17-0002-fix-iconv-linkage.patch"
|
||||
patch_description: "Replace IConv CMake variables by Conan CMake targets"
|
||||
patch_type: "conan"
|
||||
|
@ -1,12 +1,13 @@
|
||||
from conan import ConanFile
|
||||
from conan.errors import ConanInvalidConfiguration
|
||||
from conan.tools.build import check_min_cppstd
|
||||
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
|
||||
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
|
||||
from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime
|
||||
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file
|
||||
from conan.tools.microsoft import is_msvc_static_runtime
|
||||
from conan.tools.scm import Version
|
||||
import os
|
||||
|
||||
required_conan_version = ">=1.52.0"
|
||||
required_conan_version = ">=2.4"
|
||||
|
||||
|
||||
class DoxygenConan(ConanFile):
|
||||
@ -26,25 +27,9 @@ class DoxygenConan(ConanFile):
|
||||
default_options = {
|
||||
"enable_parse": True,
|
||||
"enable_search": True,
|
||||
"enable_app": False,
|
||||
"enable_app": False
|
||||
}
|
||||
|
||||
@property
|
||||
def _settings_build(self):
|
||||
return getattr(self, "settings_build", self.settings)
|
||||
|
||||
@property
|
||||
def _minimum_compiler_version(self):
|
||||
if Version(self.version) <= "1.9.1":
|
||||
return {
|
||||
"gcc": "5",
|
||||
}
|
||||
return {
|
||||
"gcc": "7", # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66297
|
||||
"Visual Studio": "15",
|
||||
"msvc": "191",
|
||||
}
|
||||
|
||||
def export_sources(self):
|
||||
export_conandata_patches(self)
|
||||
|
||||
@ -56,28 +41,34 @@ class DoxygenConan(ConanFile):
|
||||
self.requires("xapian-core/1.4.19")
|
||||
self.requires("zlib/[>=1.2.11 <2]")
|
||||
if self.options.enable_app or self.options.enable_parse:
|
||||
# INFO: Doxygen uses upper case CMake variables to link/include IConv, so we are using patches for targets.
|
||||
self.requires("libiconv/1.17")
|
||||
|
||||
def compatibility(self):
|
||||
return [{"settings": [("build_type", "Release")]}]
|
||||
|
||||
def validate(self):
|
||||
minimum_compiler_version = self._minimum_compiler_version.get(str(self.settings.compiler))
|
||||
if minimum_compiler_version and Version(self.settings.compiler.version) < minimum_compiler_version:
|
||||
raise ConanInvalidConfiguration(f"Compiler version too old. At least {minimum_compiler_version} is required.")
|
||||
if Version(self.version) == "1.8.18":
|
||||
check_min_vs(self, "191")
|
||||
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "5":
|
||||
raise ConanInvalidConfiguration("Doxygen requires GCC >=5")
|
||||
|
||||
if self.settings.compiler == "msvc" and Version(self.settings.compiler.version) < "191":
|
||||
raise ConanInvalidConfiguration("Doxygen requires Visual Studio 2017 or newer")
|
||||
|
||||
check_min_cppstd(self, "17")
|
||||
|
||||
def build_requirements(self):
|
||||
if self._settings_build.os == "Windows":
|
||||
if self.settings_build.os == "Windows":
|
||||
self.tool_requires("winflexbison/2.5.24")
|
||||
else:
|
||||
self.tool_requires("flex/2.6.4")
|
||||
self.tool_requires("bison/3.8.2")
|
||||
|
||||
self.tool_requires("cmake/[>=3.19 <4]")
|
||||
|
||||
def source(self):
|
||||
get(self, **self.conan_data["sources"][self.version], strip_root=True)
|
||||
apply_conandata_patches(self)
|
||||
|
||||
#Do not build manpages
|
||||
cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
|
||||
replace_in_file(self, cmakelists, "add_subdirectory(doc)", "")
|
||||
replace_in_file(self, cmakelists, "set(CMAKE_CXX_STANDARD", "##set(CMAKE_CXX_STANDARD")
|
||||
|
||||
def generate(self):
|
||||
tc = CMakeToolchain(self)
|
||||
@ -89,10 +80,10 @@ class DoxygenConan(ConanFile):
|
||||
tc.generate()
|
||||
|
||||
deps = CMakeDeps(self)
|
||||
deps.set_property("libiconv", "cmake_additional_variables_prefixes", ["ICONV"])
|
||||
deps.generate()
|
||||
|
||||
def build(self):
|
||||
apply_conandata_patches(self)
|
||||
cmake = CMake(self)
|
||||
cmake.configure()
|
||||
cmake.build()
|
||||
@ -106,8 +97,3 @@ class DoxygenConan(ConanFile):
|
||||
self.cpp_info.set_property("cmake_find_mode", "none")
|
||||
self.cpp_info.libdirs = []
|
||||
self.cpp_info.includedirs = []
|
||||
if self.settings.os in ["Linux", "FreeBSD"]:
|
||||
self.cpp_info.system_libs = ["pthread", "m"]
|
||||
|
||||
# TODO: to remove in conan v2
|
||||
self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
|
||||
|
@ -1,13 +0,0 @@
|
||||
--- a/addon/doxysearch/CMakeLists.txt 2020-08-24 13:12:55.000000000 +0200
|
||||
+++ b/addon/doxysearch/CMakeLists.txt 2022-12-16 20:41:07.040801300 +0100
|
||||
@@ -1,8 +1,8 @@
|
||||
-find_package(Xapian REQUIRED)
|
||||
+find_package(xapian REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
if (WIN32)
|
||||
- set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib")
|
||||
+ set(WIN_EXTRA_LIBS uuid.lib rpcrt4.lib ws2_32.lib)
|
||||
endif()
|
||||
|
||||
include_directories(
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cd0fcaaca..67e0808ae 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -109,6 +109,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index ae52cabc3..73e1e3d29 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -26,7 +27,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index 2387f1b3c..cbf451037 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -26,7 +27,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 23460d004..8f2c51012 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -325,7 +325,7 @@ target_link_libraries(doxygen
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 20c87dc6f..cd8527618 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -110,6 +110,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index ae52cabc3..73e1e3d29 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -26,7 +27,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index 2387f1b3c..cbf451037 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -26,7 +27,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index b7d4af271..6f9a032c0 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -321,7 +321,7 @@ target_link_libraries(doxygen
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 35e6a0c2d..71f609898 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -117,6 +117,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index a6a776a31..ba29331c0 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -31,7 +32,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index 8df99ab6b..034a93a4f 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
@@ -31,7 +32,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index cb289116e..2dab461e2 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -356,7 +356,7 @@ target_link_libraries(doxygen PRIVATE
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -1,70 +0,0 @@
|
||||
diff --git a/libmscgen/mscgen_bool.h b/libmscgen/mscgen_bool.h
|
||||
index e982d80..d16ef98 100644
|
||||
--- libmscgen/mscgen_bool.h
|
||||
+++ libmscgen/mscgen_bool.h
|
||||
@@ -23,6 +23,14 @@
|
||||
#ifndef MSCGEN_BOOL_H
|
||||
#define MSCGEN_BOOL_H
|
||||
|
||||
+/* Some system headers define TRUE and FALSE so undefine them first */
|
||||
+#ifdef TRUE
|
||||
+#undef TRUE
|
||||
+#endif
|
||||
+#ifdef FALSE
|
||||
+#undef FALSE
|
||||
+#endif
|
||||
+
|
||||
typedef enum
|
||||
{
|
||||
FALSE = 0,
|
||||
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
|
||||
index 0deef5d..86846f8 100644
|
||||
--- qtools/qglobal.h
|
||||
+++ qtools/qglobal.h
|
||||
@@ -357,6 +356,7 @@ typedef const char *pcchar;
|
||||
typedef __int64 int64;
|
||||
typedef unsigned __int64 uint64;
|
||||
#else
|
||||
+#include <cinttypes>
|
||||
#if !defined(_OS_AIX_) || !defined(_H_INTTYPES)
|
||||
typedef long long int64;
|
||||
#endif
|
||||
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
|
||||
index 3fdde9bc..1b32e273 100644
|
||||
--- src/doxygen.cpp
|
||||
+++ src/doxygen.cpp
|
||||
@@ -12,6 +12,7 @@
|
||||
* input used in their production; they are not affected by this license.
|
||||
*
|
||||
*/
|
||||
+#include <cinttypes>
|
||||
|
||||
#include <locale.h>
|
||||
|
||||
@@ -32,7 +33,6 @@
|
||||
#include <algorithm>
|
||||
#include <unordered_map>
|
||||
#include <memory>
|
||||
-#include <cinttypes>
|
||||
|
||||
#include "version.h"
|
||||
#include "doxygen.h"
|
||||
diff --git a/src/util.cpp b/src/util.cpp
|
||||
index 7fcd5ed..399e7a2 100644
|
||||
--- src/util.cpp
|
||||
+++ src/util.cpp
|
||||
@@ -13,13 +13,13 @@
|
||||
* input used in their production; they are not affected by this license.
|
||||
*
|
||||
*/
|
||||
+#include <cinttypes>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <math.h>
|
||||
#include <limits.h>
|
||||
-#include <cinttypes>
|
||||
#include <string.h>
|
||||
|
||||
#include <mutex>
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 06b9696f2..a70245b54 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -118,6 +118,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index 707fdedbf..8d51b76f7 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -43,7 +44,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index fe2f2c2ff..131354e95 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -31,7 +32,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 5004a9578..c63399bc1 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -351,7 +351,7 @@ target_link_libraries(doxygen PRIVATE
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -1,17 +0,0 @@
|
||||
--- libmscgen/mscgen_bool.h
|
||||
+++ libmscgen/mscgen_bool.h
|
||||
@@ -23,6 +23,14 @@
|
||||
#ifndef MSCGEN_BOOL_H
|
||||
#define MSCGEN_BOOL_H
|
||||
|
||||
+/* Some system headers define TRUE and FALSE so undefine them first */
|
||||
+#ifdef TRUE
|
||||
+#undef TRUE
|
||||
+#endif
|
||||
+#ifdef FALSE
|
||||
+#undef FALSE
|
||||
+#endif
|
||||
+
|
||||
typedef enum
|
||||
{
|
||||
FALSE = 0,
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 251e18b77..4df454b39 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -118,6 +118,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index a6fde4285..e19fc3d22 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -42,7 +43,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index f439c29d9..e56b9a1de 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -30,7 +31,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 18406488d..5c7144582 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -360,7 +360,7 @@ target_link_libraries(doxygen PRIVATE
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -1,65 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d9765964e..05784dd8f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -147,6 +147,7 @@ if (sqlite3)
|
||||
endif()
|
||||
|
||||
find_package(Iconv REQUIRED)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
include_directories(${ICONV_INCLUDE_DIR})
|
||||
|
||||
|
||||
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
|
||||
index bcc4393d4..95d06cee2 100644
|
||||
--- a/addon/doxyapp/CMakeLists.txt
|
||||
+++ b/addon/doxyapp/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -44,7 +45,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
|
||||
index 774756640..eb64c8895 100644
|
||||
--- a/addon/doxyparse/CMakeLists.txt
|
||||
+++ b/addon/doxyparse/CMakeLists.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
find_package(Iconv)
|
||||
+get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -33,7 +34,7 @@ mscgen
|
||||
doxygen_version
|
||||
doxycfg
|
||||
vhdlparser
|
||||
-${ICONV_LIBRARIES}
|
||||
+Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${SQLITE3_LIBRARIES}
|
||||
${EXTRA_LIBS}
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 9f7e65364..8d332a30a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -359,7 +359,7 @@ target_link_libraries(doxygen PRIVATE
|
||||
doxygen_version
|
||||
vhdlparser
|
||||
${SQLITE3_LIBRARIES}
|
||||
- ${ICONV_LIBRARIES}
|
||||
+ Iconv::Iconv
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${EXTRA_LIBS}
|
||||
${CLANG_LIBS}
|
||||
--
|
||||
|
@ -4,13 +4,11 @@ from conan.tools.build import can_run
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "arch", "compiler", "build_type"
|
||||
generators = "VirtualBuildEnv"
|
||||
test_type = "explicit"
|
||||
|
||||
def build_requirements(self):
|
||||
self.tool_requires(self.tested_reference_str)
|
||||
def requirements(self):
|
||||
self.requires(self.tested_reference_str)
|
||||
|
||||
def test(self):
|
||||
if can_run(self):
|
||||
self.output.info("Doxygen Version:")
|
||||
self.run("doxygen --version")
|
||||
self.run("doxygen --version", env="conanrun")
|
||||
|
@ -1,13 +1,5 @@
|
||||
versions:
|
||||
"1.12.0":
|
||||
folder: "all"
|
||||
"1.9.4":
|
||||
folder: "all"
|
||||
"1.9.2":
|
||||
folder: "all"
|
||||
"1.9.1":
|
||||
folder: "all"
|
||||
"1.8.20":
|
||||
folder: "all"
|
||||
"1.8.18":
|
||||
folder: "all"
|
||||
"1.8.17":
|
||||
folder: "all"
|
||||
folder: "all"
|
@ -67,7 +67,7 @@ class IgnitionMathConan(ConanFile):
|
||||
|
||||
def requirements(self):
|
||||
self.requires("eigen/3.3.9")
|
||||
self.requires("doxygen/1.8.17")
|
||||
self.requires("doxygen/[>=1.8 <2]")
|
||||
self.requires("swig/4.0.2")
|
||||
|
||||
def build_requirements(self):
|
||||
|
@ -75,7 +75,7 @@ class IgnitionUitlsConan(ConanFile):
|
||||
)
|
||||
|
||||
def requirements(self):
|
||||
self.requires("doxygen/1.9.2")
|
||||
self.requires("doxygen/[>=1.8 <2]")
|
||||
if self.options.ign_utils_vendor_cli11:
|
||||
self.requires("cli11/2.1.2")
|
||||
|
||||
|
@ -69,7 +69,7 @@ class Opene57Conan(ConanFile):
|
||||
self.requires("boost/1.84.0")
|
||||
|
||||
if self.options.with_docs:
|
||||
self.requires("doxygen/1.9.4")
|
||||
self.requires("doxygen/[>=1.8 <2]")
|
||||
|
||||
if self.settings.os != "Windows":
|
||||
self.requires("icu/74.1")
|
||||
|
Reference in New Issue
Block a user