diff options
| author | Jeremy Maitin-Shepard <jbms@google.com> | 2022-10-03 14:19:34 -0700 |
|---|---|---|
| committer | Frank Barchard <fbarchard@chromium.org> | 2022-10-03 22:19:28 +0000 |
| commit | c365da9c6c3a75f6e5bb8779973da6e44988307e (patch) | |
| tree | cbed39976bd63f53b6b7b215c3451f294ab87dda | |
| parent | 4b93eb90ba26f5ec50c029c2e6a6698a264c8b11 (diff) | |
| download | libyuv-c365da9c6c3a75f6e5bb8779973da6e44988307e.tar.gz | |
Use `find_package(JPEG)` in place of `include(FindJPEG)`
The former allows the package to be overridden with a local build by
`FetchContent`.
Also includes the fix to _MSC_VER conditions from:
https://aomedia.googlesource.com/aom/+/refs/heads/main/third_party/libyuv/README.libaom
Change-Id: I666e591becb3efaa7b5b68d27476319a2909b88e
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3933570
Reviewed-by: Wan-Teh Chang <wtc@google.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/cpu_id.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d190507b..5f0306bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) -INCLUDE ( FindJPEG ) +find_package ( JPEG ) if (JPEG_FOUND) include_directories( ${JPEG_INCLUDE_DIR} ) target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) diff --git a/source/cpu_id.cc b/source/cpu_id.cc index 7467c5d9..13e3da7b 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -108,7 +108,7 @@ void CpuId(int eax, int ecx, int* cpu_info) { // } // For VS2013 and earlier 32 bit, the _xgetbv(0) optimizer produces bad code. // https://code.google.com/p/libyuv/issues/detail?id=529 -#if defined(_M_IX86) && (_MSC_VER < 1900) +#if defined(_M_IX86) && defined(_MSC_VER) && (_MSC_VER < 1900) #pragma optimize("g", off) #endif #if (defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \ @@ -129,7 +129,7 @@ static int GetXCR0() { #define GetXCR0() 0 #endif // defined(_M_IX86) || defined(_M_X64) .. // Return optimization to previous setting. -#if defined(_M_IX86) && (_MSC_VER < 1900) +#if defined(_M_IX86) && defined(_MSC_VER) && (_MSC_VER < 1900) #pragma optimize("g", on) #endif |