Skip to content

Fix: Update CMake for Apple SDK 26 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JMartinon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Update CMake for Apple SDK 26 #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ else()
set(RESTRICT "__restrict")
endif()

set(TBLIS_APPLE_GNU_CXX_FLAGS "")
if(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Apple SDK Mach headers use C's _Static_assert, which GNU C++ rejects.
list(APPEND TBLIS_APPLE_GNU_CXX_FLAGS -D_Static_assert=static_assert)
endif()

# Check for bit operations
check_cxx_source_compiles("
int main()
Expand Down Expand Up @@ -452,7 +458,7 @@ add_custom_command(
CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER}
CFLAGS="${PLUGIN_FLAGS} ${OMP_SIMD_FLAG}"
CXXFLAGS="${PLUGIN_FLAGS} ${OMP_SIMD_FLAG} -std=c++20"
CXXFLAGS="${PLUGIN_FLAGS} ${OMP_SIMD_FLAG} ${TBLIS_APPLE_GNU_CXX_FLAGS} -std=c++20"
${BLIS_DEBUG_FLAG}
-f --build
--path=${CMAKE_CURRENT_SOURCE_DIR}/tblis/plugin
Expand Down Expand Up @@ -567,7 +573,7 @@ set_target_properties(tblis-objects PROPERTIES
CXX_EXTENSIONS OFF
)
target_compile_options(tblis-objects
PRIVATE ${OMP_SIMD_FLAG} $<$<CONFIG:Debug>:-O0>
PRIVATE ${OMP_SIMD_FLAG} ${TBLIS_APPLE_GNU_CXX_FLAGS} $<$<CONFIG:Debug>:-O0>
)
add_dependencies(tblis-objects plugin-build)

Expand Down