Skip to content

macOS build fix #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ihor-drachuk wants to merge 2 commits into from
Closed

macOS build fix #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ea8e9b
Updated GTest
Nov 25, 2024
6322a55
CI: Fixed Qt installation & build on latest MacOS
Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
arch: clang_64
dir: ${{github.workspace}}/qt
cache: true
setup-python: false
setup-python: true

- name: "Add Qt to PATH"
if: ${{ matrix.qt != 'qt_no' }}
Expand All @@ -159,7 +159,7 @@ jobs:
run: |
QT_SEARCH_MODE=$([[ "${{ matrix.qt }}" == "qt_no" ]] && echo "Skip" || echo "Force")

cmake -DSUITABLE_STRUCT_ENABLE_TESTS=ON -DSUITABLE_STRUCT_ENABLE_BENCHMARK=ON -DSUITABLE_STRUCT_QT_SEARCH_MODE:STRING=$QT_SEARCH_MODE -DCMAKE_BUILD_TYPE="${{matrix.build_type}}" -G "Unix Makefiles" -S "./src" -B "./build"
cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DSUITABLE_STRUCT_ENABLE_TESTS=ON -DSUITABLE_STRUCT_ENABLE_BENCHMARK=ON -DSUITABLE_STRUCT_QT_SEARCH_MODE:STRING=$QT_SEARCH_MODE -DCMAKE_BUILD_TYPE="${{matrix.build_type}}" -G "Unix Makefiles" -S "./src" -B "./build"
cmake --build "./build" --config "${{matrix.build_type}}" -j "${{env.CORES}}"
cd ./build/tests
ctest --no-tests=error --rerun-failed --output-on-failure --timeout 30 -C "${{matrix.build_type}}"
Expand Down
7 changes: 1 addition & 6 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# Disable warning
# "Compatibility with CMake < 3.5 will be removed from a future version of CMake."
# It's produced by GTest and likely Google benchmark.
set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)

# Fix warning for FetchContent_Declare regarding DOWNLOAD_EXTRACT_TIMESTAMP
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
cmake_policy(SET CMP0135 NEW)
Expand Down Expand Up @@ -50,7 +45,7 @@ if (SUITABLE_STRUCT_NEED_GTEST AND NOT TARGET gtest)

FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz
URL https://github.com/google/googletest/releases/download/v1.15.2/googletest-1.15.2.tar.gz
)

FetchContent_MakeAvailable(googletest)
Expand Down
Loading