diff --git a/.ci/compile.sh b/.ci/compile.sh index 0d65f9652..ef0a3faef 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -285,7 +285,7 @@ echo "::endgroup::" # Build echo "::group::Build project" echo "Running CMake with following build flags: ${buildflags[*]}" -cmake --build . --verbose "${buildflags[@]}" +cmake --build . "${buildflags[@]}" echo "::endgroup::" # Post-build diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 3ad86b66f..04037a74e 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -419,7 +419,7 @@ jobs: - name: "[Windows] Install NSIS" if: matrix.os == 'Windows' shell: bash - run: choco install nsis --no-progress + run: choco install nsis - name: "Setup vcpkg cache" id: vcpkg-cache diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a70f1d04..6870b3a33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,6 +172,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) # Linux/GCC, BSD/GCC, Windows/MinGW set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra") endif() + if(APPLE) # macOS + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20") # still needed? + endif() + set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations @@ -335,8 +339,8 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libco add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility) if(WITH_CLIENT - OR WITH_ORACLE - OR WITH_SERVER + OR WITH_ORACLE + OR WITH_SERVER ) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network) endif()