mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 17:19:09 +08:00
a3ad23650f
* [dlib] Updated dlib to v19.19 * - [dlib] Corrected dlib version. - [dlib] Corrected copyright installation. - [dlib] Removed deprecated calls from portfile.
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
diff --git a/dlib/cmake_utils/find_libjpeg.cmake b/dlib/cmake_utils/find_libjpeg.cmake
|
|
index 3b9e656..d741f31 100644
|
|
--- a/dlib/cmake_utils/find_libjpeg.cmake
|
|
+++ b/dlib/cmake_utils/find_libjpeg.cmake
|
|
@@ -14,7 +14,7 @@ if (DEFINED JPEG_FOUND)
|
|
return()
|
|
endif()
|
|
|
|
-find_package(JPEG QUIET)
|
|
+find_package(JPEG REQUIRED)
|
|
|
|
if(JPEG_FOUND)
|
|
set(JPEG_TEST_CMAKE_FLAGS
|
|
@@ -31,7 +31,7 @@ if(JPEG_FOUND)
|
|
message (STATUS "Found system copy of libjpeg: ${JPEG_LIBRARY}")
|
|
if(NOT test_for_libjpeg_worked)
|
|
set(JPEG_FOUND 0)
|
|
- message (STATUS "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.")
|
|
+ message (FATAL_ERROR "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.")
|
|
endif()
|
|
endif()
|
|
|
|
diff --git a/dlib/cmake_utils/find_libpng.cmake b/dlib/cmake_utils/find_libpng.cmake
|
|
index 1b35604..489a4c8 100644
|
|
--- a/dlib/cmake_utils/find_libpng.cmake
|
|
+++ b/dlib/cmake_utils/find_libpng.cmake
|
|
@@ -14,7 +14,7 @@ if (DEFINED PNG_FOUND)
|
|
return()
|
|
endif()
|
|
|
|
-find_package(PNG QUIET)
|
|
+find_package(PNG REQUIRED)
|
|
|
|
if(PNG_FOUND)
|
|
set(PNG_TEST_CMAKE_FLAGS
|
|
@@ -31,7 +31,7 @@ if(PNG_FOUND)
|
|
message (STATUS "Found system copy of libpng: ${PNG_LIBRARIES}")
|
|
if(NOT test_for_libpng_worked)
|
|
set(PNG_FOUND 0)
|
|
- message (STATUS "System copy of libpng is broken. Will build our own libpng and use that instead.")
|
|
+ message (FATAL_ERROR "System copy of libpng is broken. Will build our own libpng and use that instead.")
|
|
endif()
|
|
endif()
|
|
|