From 372e37faf255b60415d6fe8969d60d2f79c24c4d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 8 Apr 2025 18:19:08 +0200 Subject: [PATCH] Minor correction to how buildbot finds packages --- util/buildbot/common.sh | 2 +- util/buildbot/toolchain_i686-w64-mingw32.cmake | 1 + util/buildbot/toolchain_x86_64-w64-mingw32.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh index 27815f3490..08d01da44f 100644 --- a/util/buildbot/common.sh +++ b/util/buildbot/common.sh @@ -88,7 +88,7 @@ add_cmake_libs () { -DJPEG_INCLUDE_DIR=$libdir/libjpeg/include -DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)" - -DCMAKE_PREFIX_PATH=$libdir/sdl2/lib/cmake + -DSDL2_DIR=$libdir/sdl2/lib/cmake/SDL2 -DSDL2_DLL="$(_dlls $libdir/sdl2/bin/*)" -DZLIB_INCLUDE_DIR=$libdir/zlib/include diff --git a/util/buildbot/toolchain_i686-w64-mingw32.cmake b/util/buildbot/toolchain_i686-w64-mingw32.cmake index 015682394d..a8649ec513 100644 --- a/util/buildbot/toolchain_i686-w64-mingw32.cmake +++ b/util/buildbot/toolchain_i686-w64-mingw32.cmake @@ -15,3 +15,4 @@ SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake index 113cc0e78c..d09322baea 100644 --- a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake +++ b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake @@ -15,3 +15,4 @@ SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)