diff options
| author | Vincent Rabaud <vrabaud@google.com> | 2019-06-27 14:06:40 +0200 |
|---|---|---|
| committer | Vincent Rabaud <vrabaud@google.com> | 2019-07-01 10:48:54 +0200 |
| commit | 804540f183a915da1648919885c8ad716447dd38 (patch) | |
| tree | c83563c8eef34e8efe50a17ae99d7348a32b5dac | |
| parent | bf00c15b2318776fe7057cee33018b18b33abbc0 (diff) | |
| download | libwebp-804540f183a915da1648919885c8ad716447dd38.tar.gz | |
Fix cpufeatures in CMake.
cpufeatures was not installed even though WebP depends on it on Android.
BUG=webp:415
Change-Id: Iba00001534ceedbf65fbb42244a6c1341eb65134
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d5c2646a..9f312269 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,7 @@ set(exec_prefix "\$\{prefix\}") set(libdir "\$\{prefix\}/lib") set(includedir "\$\{prefix\}/include") set(PTHREAD_LIBS ${CMAKE_THREAD_LIBS_INIT}) +set(INSTALLED_LIBRARIES) # ############################################################################## # Android only. @@ -78,6 +79,7 @@ if(ANDROID) include_directories(${ANDROID_NDK}/sources/android/cpufeatures) add_library(cpufeatures STATIC ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c) + list(APPEND INSTALLED_LIBRARIES cpufeatures) target_link_libraries(cpufeatures dl) set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures) set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS} @@ -312,7 +314,7 @@ string(REGEX MATCH ${TMP}) # Define the libraries to install. -set(INSTALLED_LIBRARIES webpdecoder webp webpdemux) +list(APPEND INSTALLED_LIBRARIES webpdecoder webp webpdemux) # Deal with SIMD. Change the compile flags for SIMD files we use. list(LENGTH WEBP_SIMD_FILES_TO_INCLUDE WEBP_SIMD_FILES_TO_INCLUDE_LENGTH) |