Commit 5a162269 authored by Stefano Bonicatti's avatar Stefano Bonicatti

Make GSL library required to build Krita

parent 08708b91
......@@ -187,6 +187,7 @@ On All operating systems:
cmake --build . --config RelWithDebInfo --target ext_png
cmake --build . --config RelWithDebInfo --target ext_tiff
cmake --build . --config RelWithDebInfo --target ext_gsl
cmake --build . --config RelWithDebInfo --target ext_vc
cmake --build . --config RelWithDebInfo --target ext_libraw
cmake --build . --config RelWithDebInfo --target ext_openjpeg
......
......@@ -391,6 +391,14 @@ if (APPLE)
# find_package(Carbon REQUIRED)
endif ()
##
## Test for GNU Scientific Library
##
find_package(GSL REQUIRED)
macro_log_feature(GSL_FOUND "GSL" "GNU Scientific Library" "http://www.gnu.org/software/gsl" FALSE "1.7" "Required by Krita's Transform tool.")
macro_bool_to_01(GSL_FOUND HAVE_GSL)
configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
###########################
############################
## Optional dependencies ##
......@@ -457,14 +465,6 @@ else()
endif()
##
## Test for GNU Scientific Library
##
macro_optional_find_package(GSL)
macro_log_feature(GSL_FOUND "GSL" "GNU Scientific Library" "http://www.gnu.org/software/gsl" FALSE "1.7" "Required by Krita's Transform tool.")
macro_bool_to_01(GSL_FOUND HAVE_GSL)
configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
##
## Test for eigen3
##
......
......@@ -69,8 +69,7 @@ if (GSL_FOUND)
endif()
else ()
if (GSL_FIND_REQUIRED)
MESSAGE (STATUS "GNU Scientific Library not found. "
"Calligra Sheets' solver plugin won't be compiled.")
MESSAGE (FATAL_ERROR "Required package gsl NOT found")
endif ()
endif ()
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