Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 13:55:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve CMake's Cairo detection and issue error message...

Browse Source 
... if Cairo was requested (OPTION_CAIRO or OPTION_CAIROEXT) but
Cairo was not found. CMake generation is terminated with a fatal error.

The user has two choices: install Cairo libs and headers or disable
OPTION_CAIRO and OPTION_CAIROEXT.
This commit is contained in:
Albrecht Schlosser
2018-12-20 19:12:50 +01:00
parent a46695b7fc
commit 88129db051
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/options.cmake
+9 -3
View File
@@ -157,12 +157,12 @@ include(FindPkgConfig)
option(OPTION_CAIRO "use lib Cairo" OFF) option(OPTION_CAIRO "use lib Cairo" OFF)
option(OPTION_CAIROEXT option(OPTION_CAIROEXT
"use FLTK code instrumentation for cairo extended use" OFF "use FLTK code instrumentation for Cairo extended use" OFF
) )
if(OPTION_CAIRO OR OPTION_CAIROEXT AND LIB_CAIRO) if ((OPTION_CAIRO OR OPTION_CAIROEXT) AND LIB_CAIRO)
pkg_search_module(PKG_CAIRO cairo) pkg_search_module(PKG_CAIRO cairo)
endif(OPTION_CAIRO OR OPTION_CAIROEXT AND LIB_CAIRO) endif ((OPTION_CAIRO OR OPTION_CAIROEXT) AND LIB_CAIRO)
if (PKG_CAIRO_FOUND) if (PKG_CAIRO_FOUND)
set (FLTK_HAVE_CAIRO 1) set (FLTK_HAVE_CAIRO 1)
@@ -179,6 +179,12 @@ else()
set(FLTK_CAIRO_FOUND FALSE) set(FLTK_CAIRO_FOUND FALSE)
endif (LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND) 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) option(OPTION_USE_NANOSVG "support SVG images" ON)