# HG changeset patch # User Ximing Cheng <ximingch...@tencent.com> # Date 1464529825 -28800 # Sun May 29 21:50:25 2016 +0800 # Node ID ccbf7b3886e449d9c008a62157724409b38afa0f # Parent aeade2e8d8688ebffb8455b8948d89d6a72e2c38 cmake: change tab indent into space
diff -r aeade2e8d868 -r ccbf7b3886e4 source/CMakeLists.txt --- a/source/CMakeLists.txt Thu May 26 16:45:09 2016 +0530 +++ b/source/CMakeLists.txt Sun May 29 21:50:25 2016 +0800 @@ -189,15 +189,15 @@ if(ARM AND CROSS_COMPILE_ARM) set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm) elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm) - add_definitions(-DHAVE_NEON) - else() - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) - endif() + find_package(Neon) + if(CPU_HAS_NEON) + set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm) + add_definitions(-DHAVE_NEON) + else() + set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) + endif() endif() - add_definitions(${ARM_ARGS}) + add_definitions(${ARM_ARGS}) if(FPROFILE_GENERATE) if(INTEL_CXX) add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}") diff -r aeade2e8d868 -r ccbf7b3886e4 source/cmake/FindNeon.cmake --- a/source/cmake/FindNeon.cmake Thu May 26 16:45:09 2016 +0530 +++ b/source/cmake/FindNeon.cmake Sun May 29 21:50:25 2016 +0800 @@ -2,9 +2,9 @@ # Check the version of neon supported by the ARM CPU execute_process(COMMAND cat /proc/cpuinfo | grep Features | grep neon - OUTPUT_VARIABLE neon_version - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_VARIABLE neon_version + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) if(neon_version) - set(CPU_HAS_NEON 1) + set(CPU_HAS_NEON 1) endif() _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel