Use c++14

metno · Feb 25, 2025 · 5f450f4 · 5f450f4
1 parent 044f4fc
commit 5f450f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -78,7 +78,7 @@ jobs:
               # ln -s /usr/local/bin/gcc-13 /usr/local/bin/gcc
               # ln -s /usr/local/bin/g++-13 /usr/local/bin/g++
           # CIBW_ENVIRONMENT_MACOS: CC='/usr/local/bin/gcc' LDSHARED='/usr/local/bin/gcc' CXX='/usr/local/bin/g++'
-          CIBW_ENVIRONMENT_MACOS: CFLAGS='-Wno-c++11-narrowing' LDFLAGS='-L/opt/homebrew/lib' CPPFLAGS='-I/opt/homebrew/include -std=c++14'
+          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=14.0 LDFLAGS='-L/opt/homebrew/lib' CPPFLAGS='-I/opt/homebrew/include -std=c++14 -Wno-c++11-narrowing'
           CIBW_BEFORE_ALL_WINDOWS: choco install -y lapack-devel
           CIBW_TEST_COMMAND: >
               python {project}/tests/check_installation.py

diff --git a/swig/python-packaging/setup.in.py b/swig/python-packaging/setup.in.py
@@ -38,8 +38,8 @@ def run(self):
 module = Extension('_titanlib',
         sources=glob.glob('src/*.cpp') + glob.glob('src/*.c') + ['titanlibPYTHON_wrap.cxx'],
         libraries=["gsl", "gslcblas"],
-        extra_compile_args="-O3 -fPIC -std=c++11".split() + args,
-        extra_link_args="-O3 -fPIC -std=c++11".split() + args,
+        extra_compile_args="-O3 -fPIC -std=c++14".split() + args,
+        extra_link_args="-O3 -fPIC -std=c++14".split() + args,
         library_dirs=["/usr/lib64", "/usr/local/lib", "/usr/local/opt/armadillo/lib"],
         include_dirs=['./include', np.get_include(), '/usr/local/opt/armadillo/include',  "/usr/include", "/usr/local/include"]
 )