From 14328b0d233494ce29e57b074a8768caf31a1596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20H=C3=B8jlund=20Larsen?= Date: Wed, 4 Oct 2023 14:01:51 +0200 Subject: [PATCH] Update Workflows (#2) * update workflow to test reusables * fix abseil build for windows * use c++14 for cmake * now with release workflows --------- Co-authored-by: techbech --- .github/workflows/linux_cmake.yml | 2 +- .github/workflows/linux_mkspecs.yml | 2 +- .github/workflows/macos_cmake.yml | 2 +- .github/workflows/windows_cmake.yml | 2 +- CMakeLists.txt | 2 ++ NEWS.rst | 2 +- wscript | 3 +++ 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux_cmake.yml b/.github/workflows/linux_cmake.yml index 3eef647..9c8f7b7 100644 --- a/.github/workflows/linux_cmake.yml +++ b/.github/workflows/linux_cmake.yml @@ -16,7 +16,7 @@ env: jobs: Linux-cmake: name: Linux Cmake - uses: steinwurf/linux-cmake-action/.github/workflows/action.yml@4.0.0 + uses: steinwurf/linux-cmake-action/.github/workflows/action.yml@5.0.0 with: extra_resolve_options: $EXTRA_RESOLVE_OPTIONS concurrency: diff --git a/.github/workflows/linux_mkspecs.yml b/.github/workflows/linux_mkspecs.yml index e7e020f..7c9d4ab 100644 --- a/.github/workflows/linux_mkspecs.yml +++ b/.github/workflows/linux_mkspecs.yml @@ -13,7 +13,7 @@ name: Linux C++ make-specs pull_request: jobs: Linux-mkspecs: - uses: steinwurf/linux-mkspecs-action/.github/workflows/action.yml@6.0.0 + uses: steinwurf/linux-mkspecs-action/.github/workflows/action.yml@7.0.0 with: extra_resolve_options: ${{ github.event.inputs.extra_resolve_options }} concurrency: diff --git a/.github/workflows/macos_cmake.yml b/.github/workflows/macos_cmake.yml index 019ba60..d4eb7c1 100644 --- a/.github/workflows/macos_cmake.yml +++ b/.github/workflows/macos_cmake.yml @@ -16,7 +16,7 @@ env: jobs: MacOS-cmake: name: MacOS Cmake - uses: steinwurf/macos-cmake-action/.github/workflows/action.yml@6.0.0 + uses: steinwurf/macos-cmake-action/.github/workflows/action.yml@7.0.0 with: extra_resolve_options: $EXTRA_RESOLVE_OPTIONS concurrency: diff --git a/.github/workflows/windows_cmake.yml b/.github/workflows/windows_cmake.yml index 810f21e..3248308 100644 --- a/.github/workflows/windows_cmake.yml +++ b/.github/workflows/windows_cmake.yml @@ -16,7 +16,7 @@ env: jobs: Windows-cmake: name: Windows Cmake - uses: steinwurf/windows-cmake-action/.github/workflows/action.yml@4.0.0 + uses: steinwurf/windows-cmake-action/.github/workflows/action.yml@5.0.0 with: extra_resolve_options: $EXTRA_RESOLVE_OPTIONS concurrency: diff --git a/CMakeLists.txt b/CMakeLists.txt index cdc7a12..b91f16c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ include_guard(GLOBAL) find_package(Python COMPONENTS Interpreter) +set(CMAKE_CXX_STANDARD 14) + # Use waf to resolve dependencies if(NOT DEFINED STEINWURF_RESOLVE) message(STATUS "Resolving dependencies...") diff --git a/NEWS.rst b/NEWS.rst index c89bffc..2ec583d 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -6,7 +6,7 @@ every change, see the Git log. Latest ------ -* tbd +* Patch: Fix problems with CMake and Waf on Windows and Mac OS. 2.0.0 ----- diff --git a/wscript b/wscript index 76ee1d3..ee74219 100644 --- a/wscript +++ b/wscript @@ -126,6 +126,9 @@ def _absl(bld, cxxflags): ], ) + if bld.is_mkspec_platform("windows"): + cxxflags += " /DNOMINMAX" + bld.stlib( target="absl", source=sources,