Commit b06375c2 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'roneil/fix-cmake-errors' into 'master'

CMake: Remove clang diagnostic flag to support building with g++ and avoid missing dependency error in UseLATEX

Closes #134 and #133

See merge request !393
parents 9770595f 8718b888
Pipeline #2258124 passed with stages
in 23 minutes and 9 seconds
......@@ -94,7 +94,7 @@ INCLUDE("cmake/corryvreckan.cmake")
#########################################
# Set standard build flags
SET(COMPILER_FLAGS -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wconversion -Wuseless-cast -Wctor-dtor-privacy -Wzero-as-null-pointer-constant -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wswitch-default -Wundef -Wshadow -Wformat-security -Wdeprecated -fdiagnostics-color=auto -Wheader-hygiene)
SET(COMPILER_FLAGS -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wconversion -Wuseless-cast -Wctor-dtor-privacy -Wzero-as-null-pointer-constant -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wswitch-default -Wundef -Wshadow -Wformat-security -Wdeprecated -fdiagnostics-color=auto)
INCLUDE("cmake/compiler-flag-checks.cmake")
......
......@@ -64,6 +64,7 @@ The following authors, in alphabetical order, have contributed to Corryvreckan:
* Daniel Hynds, Nikhef, @dhynds
* Magnus Mager, CERN, @mmager
* Andreas Matthias Nürnberg, KIT, @nurnberg
* Ryunosuke O'Neil, University of Edinburgh, @roneil
* Klaas Padeken, Bonn, HISKP, @padeken
* Florian Pitters, HEPHY, @fpipper
* Tomas Vanat, CERN, @tvanat
......
......@@ -26,6 +26,14 @@ FIND_PACKAGE(LATEX)
# Only add target if we have LaTeX
IF(LATEX_COMPILER)
MESSAGE(STATUS "Found LaTeX compiler.")
find_program(IMAGEMAGICK NAMES magick convert)
IF (NOT IMAGEMAGICK)
# stop processing / don't add documentation targets
MESSAGE(WARNING "ImageMagick is not found, but is required by UseLATEX.cmake!")
RETURN()
ENDIF()
SET(LATEX_COMPILER_FLAGS "-shell-escape" "-interaction nonstopmode" "-halt-on-error" "-file-line-error" CACHE STRING "Flags passed to latex.")
INCLUDE(${PROJECT_SOURCE_DIR}/cmake/LATEX.cmake)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment