Make compilation on M1 Macs work (#1383)
This commit is contained in:
+1
-1
@@ -83,7 +83,7 @@ if(WIN32)
|
|||||||
list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL") # hints for FindSDL
|
list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL") # hints for FindSDL
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
if(CMAKE_HOST_APPLE)
|
||||||
execute_process(COMMAND xcrun --show-sdk-path
|
execute_process(COMMAND xcrun --show-sdk-path
|
||||||
OUTPUT_VARIABLE SDKROOT
|
OUTPUT_VARIABLE SDKROOT
|
||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
|
|||||||
@@ -66,6 +66,9 @@ get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTO
|
|||||||
foreach(dir ${dirs})
|
foreach(dir ${dirs})
|
||||||
#message(STATUS "dir='${dir}'")
|
#message(STATUS "dir='${dir}'")
|
||||||
set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -I${dir})
|
set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -I${dir})
|
||||||
|
|
||||||
|
# Force to build 32 bit binaries (Fix for Apple Silicon M1 hosts)
|
||||||
|
set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -m32)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -DRTOS_COOS -Wno-inconsistent-missing-override)
|
set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -DRTOS_COOS -Wno-inconsistent-missing-override)
|
||||||
@@ -74,7 +77,7 @@ set(YAML_GEN_ARGS ${YAML_GEN_ARGS} -DRTOS_COOS -Wno-inconsistent-missing-overrid
|
|||||||
|
|
||||||
add_custom_target(yaml_data
|
add_custom_target(yaml_data
|
||||||
WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
|
WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
|
||||||
COMMAND ${PYTHON_EXECUTABLE} ${YAML_GEN} ${YAML_GEN_ARGS} > ${YAML_GEN_OUTPUT}
|
COMMAND ${PYTHON_EXECUTABLE} ${YAML_GEN} ${YAML_GEN_ARGS} ${SYSROOT_ARG} > ${YAML_GEN_OUTPUT}
|
||||||
DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h
|
DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h
|
||||||
${RADIO_DIRECTORY}/src/dataconstants.h
|
${RADIO_DIRECTORY}/src/dataconstants.h
|
||||||
${RADIO_DIRECTORY}/src/myeeprom.h
|
${RADIO_DIRECTORY}/src/myeeprom.h
|
||||||
|
|||||||
Reference in New Issue
Block a user