Skip to content

Commit

Permalink
Improvement of WARN_LOGFILE possibilities
Browse files Browse the repository at this point in the history
Merge branch 'master' into feature/bug_warn_logfile
  • Loading branch information
albert-github committed Dec 9, 2021
2 parents 3ce0f79 + 8f7d18e commit 5040e82
Show file tree
Hide file tree
Showing 417 changed files with 36,875 additions and 27,833 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/build_cmake.yml
Expand Up @@ -103,13 +103,19 @@ jobs:
run: |
sudo apt remove llvm-8 clang-8 libclang-common-8-dev clang-format-8 libllvm8
sudo apt remove llvm-9 llvm-9-dev llvm-9-tools llvm-9-runtime clang-9 libclang-common-9-dev clang-format-9 libllvm9
#sudo apt remove llvm-10 llvm-10-dev llvm-10-tools llvm-10-runtime clang-10 clang-format-10 libclang-common-10-dev libclang-cpp10 libclang1-10 libllvm10
sudo apt remove llvm-11 llvm-11-dev llvm-11-tools llvm-11-runtime clang-11 clang-format-11 libclang-common-11-dev libclang-cpp11 libclang1-11 libllvm11
sudo apt remove llvm-12 llvm-12-dev llvm-12-tools llvm-12-runtime clang-12 clang-format-12 libclang-common-12-dev libclang-cpp12 libclang1-12 libllvm12
sudo apt-get autoremove
sudo apt-get clean
#sudo apt install libclang-9-dev libclang-common-9-dev
sudo apt install libclang-10-dev libclang-common-10-dev
sudo apt install libclang-common-10-dev libclang-10-dev
apt list --installed | egrep '(clang|llvm)'
ls -d /usr/lib/llvm-*/include/
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 100
ls -al /usr/bin/clang++
ls -al /etc/alternatives/clang++
which clang++
clang++ -v
if: matrix.config.os == 'ubuntu-20.04'

Expand Down Expand Up @@ -172,7 +178,9 @@ jobs:
if: matrix.config.os == 'windows-latest'

- name: Install xmllint (Linux)
run: sudo apt-get install libxml2-utils
run: |
sudo apt-get update
sudo apt-get install libxml2-utils
if: startsWith(matrix.config.os,'ubuntu-')

- name: Install xmllint (MacOS)
Expand Down
8 changes: 4 additions & 4 deletions BUILD.txt
@@ -1,19 +1,19 @@
Doxygen uses cmake (http://www.cmake.org/) to build executables for various platforms.
It's required at least cmake version 3.3.
At least cmake version 3.3 is required.

The first step is to create a build directory where the output should be stored.
Doxygen can be fully build outside of the source tree.
Doxygen can be fully built outside of the source tree.

The second step is to invoke cmake from within the build directory with the desired generator.

For Linux/Unix systems do the following
For Linux/Unix systems do the following:

mkdir build
cd build
cmake -G "Unix Makefiles" path/to/root/of/doxygen/source/tree
make

This also works for MacOSX, but if XCode is installed you can also generate an XCode project file
This also works for MacOS, but if XCode is installed you can also generate an XCode project file

cmake -G XCode path/to/root/of/doxygen/source/tree

Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Expand Up @@ -61,6 +61,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON)

if (CMAKE_SYSTEM MATCHES "Darwin")
set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION_MIN}" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_C_FLAGS}")
find_library(CORESERVICES_LIB CoreServices)
Expand All @@ -82,6 +83,9 @@ if (WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
endif()
endif()
if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
endif()

if(POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
Expand Down
4 changes: 0 additions & 4 deletions Doxyfile
Expand Up @@ -221,7 +221,6 @@ PDF_HYPERLINKS = YES
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
LATEX_SOURCE_CODE = NO
LATEX_BIB_STYLE = plain
LATEX_TIMESTAMP = NO
LATEX_EMOJI_DIRECTORY =
Expand All @@ -234,7 +233,6 @@ COMPACT_RTF = NO
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
RTF_SOURCE_CODE = NO
#---------------------------------------------------------------------------
# Configuration options related to the man page output
#---------------------------------------------------------------------------
Expand All @@ -255,7 +253,6 @@ XML_NS_MEMB_FILE_SCOPE = NO
#---------------------------------------------------------------------------
GENERATE_DOCBOOK = NO
DOCBOOK_OUTPUT = docbook
DOCBOOK_PROGRAMLISTING = NO
#---------------------------------------------------------------------------
# Configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
Expand Down Expand Up @@ -292,7 +289,6 @@ EXTERNAL_PAGES = YES
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO
DIA_PATH =
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = YES
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
1.9.2
1.9.3

0 comments on commit 5040e82

Please sign in to comment.