diff options
author | Laurent Rineau <Laurent.Rineau@cgal.org> | 2020-03-12 20:14:57 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-12 20:14:57 (GMT) |
commit | 01edb490daa2942227992d8a60bd3673551995bf (patch) | |
tree | 480aac22ab3a2667657b2cd2391f59fde61c5cbb | |
parent | f24a0791257f7a5236ca24b5fbbfbe1bb9638486 (diff) | |
download | Doxygen-01edb490daa2942227992d8a60bd3673551995bf.zip Doxygen-01edb490daa2942227992d8a60bd3673551995bf.tar.gz Doxygen-01edb490daa2942227992d8a60bd3673551995bf.tar.bz2 |
Fix C compiler warnings about C++ flags (#7636)
* Fix C compiler warnings about C++ flags
```
cc1: warning: command line option ‘-Wnon-virtual-dtor’ is valid for C++/ObjC++ but not for C
cc1: warning: command line option ‘-Woverloaded-virtual’ is valid for C++/ObjC++ but not for C
```
... using the generator expression `$<COMPILE_LANGUAGE:CXX>`.
* COMPILE_LANGUAGE is new in CMake 3.3
See https://cmake.org/cmake/help/v3.3/release/3.3.html
* CMake 3.3 is required
-rw-r--r-- | BUILD.txt | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | cmake/CompilerWarnings.cmake | 22 |
3 files changed, 14 insertions, 12 deletions
@@ -1,5 +1,5 @@ Doxygen uses cmake (http://www.cmake.org/) to build executables for various platforms. -It's required at least cmake version 3.1.3 +It's required at least cmake version 3.3. 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. diff --git a/CMakeLists.txt b/CMakeLists.txt index 764aebe..a9545d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # Documents produced by Doxygen are derivative works derived from the # input used in their production; they are not affected by this license. -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.3) project(doxygen) option(build_wizard "Build the GUI frontend for doxygen." OFF) diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index 4c422b6..b7c6a54 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -41,14 +41,15 @@ function(set_project_warnings project_name) -Wextra # reasonable and standard -Wshadow # warn the user if a variable declaration shadows one from a # parent context - -Wnon-virtual-dtor # warn the user if a class with virtual functions has a - # non-virtual destructor. This helps catch hard to - # track down memory errors + $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor> + # warn the user if a class with virtual functions has a + # non-virtual destructor. This helps catch hard to + # track down memory errors # -Wold-style-cast # warn for c-style casts -Wcast-align # warn for potential performance problem casts -Wunused # warn on anything being unused - -Woverloaded-virtual # warn if you overload (not override) a virtual - # function + $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual> + # warn if you overload (not override) a virtual function -Wpedantic # warn if non-standard C++ is used -Wconversion # warn on type conversions that may lose data -Wnull-dereference # warn if a null dereference is detected @@ -72,14 +73,15 @@ function(set_project_warnings project_name) -Wextra # reasonable and standard #-Wshadow # warn the user if a variable declaration shadows one from a # # parent context - -Wnon-virtual-dtor # warn the user if a class with virtual functions has a - # non-virtual destructor. This helps catch hard to - # track down memory errors + $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor> + # warn the user if a class with virtual functions has a + # non-virtual destructor. This helps catch hard to + # track down memory errors # -Wold-style-cast # warn for c-style casts -Wcast-align # warn for potential performance problem casts -Wunused # warn on anything being unused - -Woverloaded-virtual # warn if you overload (not override) a virtual - # function + $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual> + # warn if you overload (not override) a virtual function -Wpedantic # warn if non-standard C++ is used #-Wconversion # warn on type conversions that may lose data #-Wnull-dereference # warn if a null dereference is detected |