diff --git a/cmake/mingw-w64-static/PKGBUILD b/cmake/mingw-w64-static/PKGBUILD index 3316570b..439a7ad1 100644 --- a/cmake/mingw-w64-static/PKGBUILD +++ b/cmake/mingw-w64-static/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mingw-w64-cmake-static pkgver=1 -pkgrel=2 +pkgrel=3 arch=('any') pkgdesc='CMake wrapper for MinGW (mingw-w64, static)' depends=('mingw-w64-cmake') diff --git a/cmake/mingw-w64-static/toolchain-mingw-static.cmake b/cmake/mingw-w64-static/toolchain-mingw-static.cmake index c5b5a161..ce006834 100644 --- a/cmake/mingw-w64-static/toolchain-mingw-static.cmake +++ b/cmake/mingw-w64-static/toolchain-mingw-static.cmake @@ -28,6 +28,9 @@ set(libbrotlicommon_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlicommon_brotlicommon}" set(libbrotlienc_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlienc_brotlienc}" CACHE INTERNAL "static libbrotliend") set(libbrotlidec_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlidec_brotlidec}" CACHE INTERNAL "static libbrotlidec") +# disable use of find modules that don't work for static libraries +set(CMAKE_DISABLE_FIND_PACKAGE_harfbuzz TRUE) + # define dependencies of various static libraries as CMake doesn't pull them reliably automatically # note: It would be possible to deduce the dependencies via pkg-config. However, for simplicity I'm hard-coding the dependencies for now. # In some cases the pkg-config file wouldn't work anyways because it is only covering the shared version (despite use of `-static`). diff --git a/cmake/static-compat/PKGBUILD b/cmake/static-compat/PKGBUILD index 69287436..50ed07de 100644 --- a/cmake/static-compat/PKGBUILD +++ b/cmake/static-compat/PKGBUILD @@ -1,6 +1,6 @@ pkgname=static-compat-cmake pkgver=1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="CMake wrapper to use gcc-static-compat" depends=('cmake' 'static-compat-environment') diff --git a/cmake/static-compat/toolchain-static-compat.cmake b/cmake/static-compat/toolchain-static-compat.cmake index 4f7338ed..3d54c98f 100644 --- a/cmake/static-compat/toolchain-static-compat.cmake +++ b/cmake/static-compat/toolchain-static-compat.cmake @@ -5,9 +5,13 @@ set (CMAKE_SYSTEM_PROCESSOR @PROCESSOR@) set (CMAKE_C_COMPILER @PREFIX@/bin/gcc) set (CMAKE_CXX_COMPILER @PREFIX@/bin/g++) -# where is the target environment +# specify the root path of the target environment set (CMAKE_FIND_ROOT_PATH @PREFIX@) set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) + +# disable use of find modules that don't work for static libraries +set(CMAKE_DISABLE_FIND_PACKAGE_harfbuzz TRUE) +