File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -93,12 +93,12 @@ enable_testing()
9393# Build types and default flags
9494# -----------------------------------------------------------------------------
9595
96- message ("Architecture is ${CMAKE_HOST_SYSTEM_PROCESSOR } " )
96+ message ("Architecture is ${CMAKE_SYSTEM_PROCESSOR } " )
9797if ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU" )
9898 set (FCONCEPTS_DIAGNOSTICS_DEPTH "-fconcepts-diagnostics-depth=3" )
9999endif ()
100100
101- if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64)
101+ if (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" )
102102 set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-elide-constructors ${FCONCEPTS_DIAGNOSTICS_DEPTH} " CACHE STRING "" FORCE)
103103 set (CMAKE_CXX_FLAGS_RELEASE "-Ofast -DNDEBUG " CACHE STRING "" FORCE)
104104 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Ofast -g -DNDEBUG" CACHE STRING "" FORCE)
Original file line number Diff line number Diff line change @@ -49,6 +49,13 @@ set(INHERITED_CMAKE_ARGS
4949 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
5050 -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
5151 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
52+ -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
53+ -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
54+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
55+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
56+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
57+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
58+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
5259 -DEP_BASE=${EP_BASE}
5360 -DFORCE_EXTERNAL_TILEDB=${FORCE_EXTERNAL_TILEDB}
5461 -DTILEDB_S3=${TILEDB_S3}
You can’t perform that action at this time.
0 commit comments