Permalink
Browse files

cmake: small tweaks concerning latest changes in q_platform.c

  • Loading branch information...
rafal1137 committed Nov 6, 2018
1 parent 22ace29 commit 45a497eaec18e8d54652fcc9046283d9a4fde4ad
Showing with 12 additions and 15 deletions.
  1. +12 −15 cmake/ETLPlatform.cmake
@@ -28,14 +28,12 @@ endif()
# FIXME: move this down to UNIX section?
if(ARM)
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
message(STATUS "ARMV6 build options set.")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -march=armv6zk -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk -O2")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
message(STATUS "ARMV7 build options set.")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -march=armv7-a -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -march=armv7-a -O2")
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armeabi")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=vfp -O2")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armeabi-v7a")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -mfloat-abi=hard -mfpu=neon -O2")
else()
message(STATUS "Unknown ARM processor detected !!!")
endif()
@@ -161,15 +159,14 @@ if(NOT APPLE)
else()
set(ARCH "x86_64")
endif()
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
message(STATUS "Detected ARMV6 target processor")
set(ARCH "arm")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
message(STATUS "Detected ARMV7 target processor")
set(ARCH "arm")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armeabi")
set(ARCH "armv6")
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armeabi-v7a") #
set(ARCH "armv7")
#add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64-v8a")
set(ARCH "armv_64")
else()
set(ARCH "${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS "Warning: processor architecture not recognised (${CMAKE_SYSTEM_PROCESSOR})")
endif()
endif(NOT APPLE)

0 comments on commit 45a497e

Please sign in to comment.