Skip to content

Commit 8ec6f41

Browse files
committed
[cmake] bump minimal cxx standard, fix build type caching
1 parent 94cf350 commit 8ec6f41

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.ci/azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ strategy:
1313
container: $[ variables['containerImage'] ]
1414

1515
steps:
16-
- script: ./.ci/travis.script.bash
16+
- script: ./.ci/pytest.bash
17+
- script: ./.ci/wheel.bash

.ci/common_setup.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ python -m venv ~/venv
1919
source ~/venv/bin/activate
2020
python -m pip install -U pip pytest wheel
2121

22-
python -m install git+https://github.com/pymor/pymor.git#egg=pymor
22+
python -m pip install git+https://github.com/pymor/pymor.git#egg=pymor

.ci/pytest.bash

100644100755
File mode changed.

.ci/wheel.bash

100644100755
File mode changed.

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.2)
22

33
# this should only be necessary while the deal setup macro is copied
4-
set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
4+
set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
55

66
project(pymor_dealii)
77

@@ -10,7 +10,7 @@ INCLUDE(dealii_macro)
1010
# Set a default build configuration if none is specified. 'MinSizeRel' produces the smallest binaries
1111
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1212
message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
13-
set(CMAKE_BUILD_TYPE RelWithDebInfo STRING "Choose the type of build." FORCE)
13+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
1414
endif()
1515
# Add a CMake parameter for choosing a desired Python version
1616
set(PYBIND11_PYTHON_VERSION "3" CACHE STRING "Python version to use for compiling the example library")

0 commit comments

Comments
 (0)