index d598c31..6680b2b 100644 --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -84,7 +84,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") if (USE_NEON) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=apple-m1") add_definitions (-DHAVE_NEON) endif() endif() @@ -276,7 +276,7 @@ OUTPUT_STRIP_TRAILING_WHITESPACE ) -else() +elseif(NOT DEFINED GIT_COMMIT_HASH) set(GIT_COMMIT_HASH "unknown") endif() add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"") --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt @@ -18,12 +18,12 @@ endif() configure_file (config.h.in config.h) include_directories ( + "${CMAKE_SOURCE_DIR}/include" ${FAAD2_INCLUDE_DIRS} ${AO_INCLUDE_DIRS} ${RTL_SDR_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_SOURCE_DIR}/include" ) link_directories ( ${FAAD2_LIBRARY_DIRS}