Skip to content

Commit ca2b989

Browse files
committed
Disable extensions
1 parent f5bd8f7 commit ca2b989

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@
77
# The full license is in the file LICENSE, distributed with this software. #
88
############################################################################
99

10+
set(CMAKE_CXX_EXTENSIONS OFF)
11+
1012
cmake_minimum_required(VERSION 3.29)
1113
project(xtensor-blas)
1214

15+
if(NOT CMAKE_CXX_STANDARD)
16+
set(CMAKE_CXX_STANDARD 20)
17+
endif()
18+
1319
set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1420
set(XTENSOR_BLAS_INCLUDE_DIR ${INCLUDE_DIR})
1521

@@ -80,6 +86,7 @@ target_include_directories(xtensor-blas
8086
$<INSTALL_INTERFACE:include>)
8187

8288
target_compile_features(xtensor-blas INTERFACE cxx_std_20)
89+
set_target_properties(xtensor-blas PROPERTIES CMAKE_CXX_EXTENSIONS OFF)
8390

8491
OPTION(CXXBLAS_DEBUG "print cxxblas debug information" OFF)
8592
OPTION(XTENSOR_USE_FLENS_BLAS "use FLENS generic implementation instead of cblas" OFF)

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ set(XTENSOR_BLAS_TESTS
120120
)
121121

122122
add_executable(test_xtensor_blas ${XTENSOR_BLAS_TESTS} ${XTENSOR_BLAS_HEADERS} ${XTENSOR_HEADERS})
123-
#target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
124-
target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
123+
set_target_properties(test_xtensor_blas PROPERTIES CMAKE_CXX_EXTENSIONS OFF)
124+
target_link_libraries(test_xtensor_blas ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
125125

126126
add_custom_target(xtest COMMAND test_xtensor_blas DEPENDS test_xtensor_blas)
127127
add_test(NAME xtest COMMAND test_xtensor_blas)

0 commit comments

Comments
 (0)