From 6d81db78f9bca7f5d8361d86c87d3fe7260c1637 Mon Sep 17 00:00:00 2001 From: Bill Dolinar Date: Fri, 17 Nov 2023 16:38:48 -0700 Subject: [PATCH] Updated to build with macOS Sonoma. --- .github/workflows/XmsCore-CI.yaml | 4 ++-- CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/XmsCore-CI.yaml b/.github/workflows/XmsCore-CI.yaml index 469b3f91..1f7eb86e 100644 --- a/.github/workflows/XmsCore-CI.yaml +++ b/.github/workflows/XmsCore-CI.yaml @@ -202,7 +202,7 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 + pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2" # Login to Aquaveo Docker - name: Login to Aquaveo Docker @@ -328,7 +328,7 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 + pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0 python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2" # Setup Visual Studio - name: Setup Visual Studio diff --git a/CMakeLists.txt b/CMakeLists.txt index e5354b8f..f5491159 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.2) +cmake_minimum_required(VERSION 3.11.0) cmake_policy(SET CMP0015 NEW) # Link Directory Pathing set(CMAKE_DEBUG_POSTFIX _d) @@ -15,6 +15,7 @@ project(xmscorelib C CXX) if (APPLE) set(CMAKE_POSITION_INDEPENDENT_CODE False) + add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) else() set(CMAKE_POSITION_INDEPENDENT_CODE True) endif()