Skip to content

Commit 4b2fa22

Browse files
committed
Fixed OSX build
1 parent ae8005c commit 4b2fa22

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

.github/workflows/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: micromamba install 'openblas==0.3.29=openmp*' blas-devel
4040

4141
- name: Configure using CMake
42-
run: cmake -Bbuild -DCMAKE_CXX_STANDARD=17 -DBUILD_TESTS=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
42+
run: cmake -Bbuild -DBUILD_TESTS=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
4343

4444
- name: Build
4545
working-directory: build

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@
88
############################################################################
99

1010
cmake_minimum_required(VERSION 3.29)
11+
12+
# Otherwise adds std=gnu++17 on OSX ...
13+
set(CMAKE_CXX_EXTENSIONS OFF)
14+
1115
project(xtensor-blas)
1216

17+
# Otherwise adds flags for C++11 standard on OSX ...
18+
if(NOT CMAKE_CXX_STANDARD)
19+
set(CMAKE_CXX_STANDARD 20)
20+
endif()
21+
message(STATUS "🔧 C++ standard: ${CMAKE_CXX_STANDARD}")
22+
23+
1324
set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1425
set(XTENSOR_BLAS_INCLUDE_DIR ${INCLUDE_DIR})
1526

0 commit comments

Comments
 (0)