mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake CAIRO support minor improvements: Make the conditional code more readeable by reusing the already parsed PKG_CAIRO_FOUND variable instead of testing for it again, which also simplifies the preconditions testing. Fix typo (. in endif statement comment).

Browse Source
This commit is contained in:
fabien 2018-12-22 08:26:56 -06:00
parent 31dddf5719
commit e3b289e008
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMake/options.cmake
View File

@ -170,21 +170,21 @@ if (PKG_CAIRO_FOUND)
list(APPEND FLTK_LDLIBS -lcairo -lpixman-1)
include_directories(${PKG_CAIRO_INCLUDE_DIRS})
string(REPLACE ";" " " CAIROFLAGS "${PKG_CAIRO_CFLAGS}")
if (LIB_CAIRO AND OPTION_CAIROEXT)
set(FLTK_USE_CAIRO 1)
set(FLTK_CAIRO_FOUND TRUE)
else ()
set(FLTK_CAIRO_FOUND FALSE)
endif (LIB_CAIRO AND OPTION_CAIROEXT)
else ()
if ((OPTION_CAIRO OR OPTION_CAIROEXT))
message(STATUS "*** Cairo was requested but not found - please check your cairo installation")
message(STATUS "*** or disable options OPTION_CAIRO and OPTION_CAIRO_EXT.")
message(FATAL_ERROR "*** Terminating: missing Cairo libs or headers.")
endif ((OPTION_CAIRO OR OPTION_CAIROEXT))
endif (PKG_CAIRO_FOUND)
if (LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND)
set(FLTK_USE_CAIRO 1)
set(FLTK_CAIRO_FOUND TRUE)
else()
set(FLTK_CAIRO_FOUND FALSE)
endif (LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND)
if ((OPTION_CAIRO OR OPTION_CAIROEXT) AND NOT PKG_CAIRO_FOUND)
message(STATUS "*** Cairo was requested but not found - please install Cairo ...")
message(STATUS "*** or disable options OPTION_CAIRO and OPTION_CAIRO_EXT")
message(FATAL_ERROR "*** Terminating: missing Cairo libs or headers")
endif ((OPTION_CAIRO OR OPTION_CAIROEXT) AND NOT PKG_CAIRO_FOUND)
#######################################################################
option(OPTION_USE_NANOSVG "support SVG images" ON)