summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsi29a <psi29a@gmail.com>2022-01-04 09:14:16 +0000
committerpsi29a <psi29a@gmail.com>2022-01-04 09:14:16 +0000
commit2e43a1278b61b74ad1bb7b74f7bbe96526a5e114 (patch)
treeea02eba655b737cf29f1916c49b01b1f2848b3df
parent0dc4a668c353cb7001009ad5777522cc7eb7fcda (diff)
parent1816784784855e5defb66bd6cd41e3586c57ece6 (diff)
Merge branch 'cpp17_on_mac' into 'master'
Update CI/before_script.osx.sh to allow full use of c++17 on macOS See merge request OpenMW/openmw!1523
-rwxr-xr-xCI/before_script.osx.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 6d0fe8c99e..8b2c9c6f01 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -16,7 +16,7 @@ cmake \
-D CMAKE_CXX_FLAGS="-stdlib=libc++" \
-D CMAKE_C_FLAGS_RELEASE="-g -O0" \
-D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
--D CMAKE_OSX_DEPLOYMENT_TARGET="10.14" \
+-D CMAKE_OSX_DEPLOYMENT_TARGET="10.15" \
-D CMAKE_BUILD_TYPE=RELEASE \
-D OPENMW_OSX_DEPLOYMENT=TRUE \
-D OPENMW_USE_SYSTEM_SQLITE3=OFF \