summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2019-08-28 01:11:34 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2019-08-28 14:36:29 +0300
commit33a5322d0126b0fcf90026b6bf26092fd78b072e (patch)
tree9b5453585b792c3f16682aa8c15f78db541ae705
parent7b4671c9fcfb4a49f46cf9db20373a5a230bc35b (diff)
[cmake] Fix finding static libraries of libjpeg-turbo with CMake < 3.10
Change-Id: I83f02ab897f2bbc922664387dc58835d53737f6e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r--Source/cmake/OptionsQt.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index b190f2151..ed7f4d52f 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -451,6 +451,8 @@ endif ()
find_package(Threads REQUIRED)
if (USE_LIBJPEG)
+ # Additional names of libjpeg to search (fixed in CMake 3.12.0)
+ set(JPEG_NAMES jpeg-static libjpeg-static)
find_package(JPEG)
if (NOT JPEG_FOUND)
message(FATAL_ERROR "libjpeg not found. Please make sure that CMake can find its header files and libraries, or build with -DUSE_LIBJPEG=OFF with possible degradation of user experience")