dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 15:32:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Fix CMake redefinition for HAVE_CPU_FEATURES_H"

Browse Source
This commit is contained in:
Pascal Massimino 2017-09-26 05:59:05 +00:00 committed by Gerrit Code Review
commit be590e0644
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -48,7 +48,7 @@ if(ANDROID)
set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS} set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS}
${ANDROID_NDK}/sources/android/cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures
) )
add_definitions(-DHAVE_CPU_FEATURES_H) add_definitions(-DHAVE_CPU_FEATURES_H=1)
set(HAVE_CPU_FEATURES_H 1) set(HAVE_CPU_FEATURES_H 1)
else() else()
set(HAVE_CPU_FEATURES_H 0) set(HAVE_CPU_FEATURES_H 0)

2
cmake/config.h.in
View File

@ -14,7 +14,7 @@
#cmakedefine HAVE_BUILTIN_BSWAP64 1 #cmakedefine HAVE_BUILTIN_BSWAP64 1
/* Define to 1 if you have the <cpu-features.h> header file. */ /* Define to 1 if you have the <cpu-features.h> header file. */
#cmakedefine HAVE_CPU_FEATURES_H #cmakedefine HAVE_CPU_FEATURES_H 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#cmakedefine HAVE_DLFCN_H 1 #cmakedefine HAVE_DLFCN_H 1