diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10410a002..b255e67f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -617,7 +617,6 @@ jobs: -DSFML_DIR="${env:GITHUB_WORKSPACE}/SFML-${env:SFML_VERSION}/lib/cmake/SFML/" -DSDL2_PATH="${env:GITHUB_WORKSPACE}/SDL2-${env:SDL_VERSION}" -DSDL2_TTF_PATH="${env:GITHUB_WORKSPACE}/SDL2_ttf-${env:SDL_TTF_VERSION}" - -DFREETYPE_WINDOWS_BINARIES_PATH="${env:GITHUB_WORKSPACE}/freetype-windows-binaries-${env:FREETYPE_VERSION}" & "cmake-${env:CMAKE_VERSION}.${env:CMAKE_VERSION_PATCH}-win32-x86/bin/cmake.exe" --build tests/cmake/build --config Release @@ -730,7 +729,7 @@ jobs: cmake --build TGUI-build-dylibs --config Debug --target install - cmake -GNinja -DTGUI_DIR="$GITHUB_WORKSPACE/TGUI-build-dylibs/install/lib/cmake/TGUI/" -S tests/cmake -B tests/cmake/build + cmake -GNinja -DTGUI_ROOT="$GITHUB_WORKSPACE/TGUI-build-dylibs/install/" -S tests/cmake -B tests/cmake/build cmake --build tests/cmake/build --config Debug @@ -757,7 +756,7 @@ jobs: cmake --build TGUI-build-framework --config Release --target install - cmake -GNinja -DTGUI_DIR="$GITHUB_WORKSPACE/TGUI-build-frameworks/install/lib/cmake/TGUI/" -S tests/cmake -B tests/cmake/build + cmake -GNinja -DTGUI_ROOT="$GITHUB_WORKSPACE/TGUI-build-frameworks/install/" -S tests/cmake -B tests/cmake/build cmake --build tests/cmake/build --config Debug diff --git a/tests/cmake/CMakeLists.txt b/tests/cmake/CMakeLists.txt index 13921e94f..7e0ec7912 100644 --- a/tests/cmake/CMakeLists.txt +++ b/tests/cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(TGUI-CMake-test) add_executable(TguiTest main.cpp)