summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-01 12:18:33 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-02-01 12:18:33 +0100
commit8dc1166eaa15c3e288e1126e281d318ab96c4c89 (patch)
tree73b75a639fef31912380e3624aa46bf38af50bd5 /cmake
parent07f3557fb8cba03589bb2350dc14184f058c7ea4 (diff)
cmake: use the jpeg module of cmake to find the library
finding libjpeg can be a bit more complex, there are systems that are not delivering a .pc for it. So we should just use the cmake module to find it.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config/common.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index d95d0ec7a2..96b105c6c0 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -2,6 +2,7 @@ include(CheckSymbolExists)
2include(CheckIncludeFile) 2include(CheckIncludeFile)
3include(CheckTypeSize) 3include(CheckTypeSize)
4include(FindPkgConfig) 4include(FindPkgConfig)
5include(FindJPEG)
5include(CTest) 6include(CTest)
6find_package(Threads REQUIRED) 7find_package(Threads REQUIRED)
7 8
@@ -10,7 +11,9 @@ pkg_check_modules(LIBSYSTEMD libsystemd)
10pkg_check_modules(VALGRIND valgrind) 11pkg_check_modules(VALGRIND valgrind)
11pkg_check_modules(OPENSSL openssl>=1.0) 12pkg_check_modules(OPENSSL openssl>=1.0)
12pkg_check_modules(GNUTLS gnutls>=2.12.16) 13pkg_check_modules(GNUTLS gnutls>=2.12.16)
13pkg_check_modules(LIBJPEG libjpeg REQUIRED) 14if (NOT JPEG_FOUND)
15 error("a jpeg library is needed.")
16endif()
14 17
15set(SUGGEST_VALGRIND OFF) 18set(SUGGEST_VALGRIND OFF)
16if("${BUILD_PROFILE}" STREQUAL "dev") 19if("${BUILD_PROFILE}" STREQUAL "dev")