From ee4ce35a681f6d9e39442fbc6cdf8e1e442febe8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Nov 2018 14:29:26 +0100 Subject: [PATCH] build-style/cmake: dehardcode gtk2 wxWdigets when cross compiling --- common/build-style/cmake.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 1b37fddba63..92f5fe71508 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -15,6 +15,9 @@ do_configure() { mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;; *) _CMAKE_SYSTEM_PROCESSOR=generic ;; esac + if [ -x "${XBPS_CROSS_BASE}/usr/bin/wx-config-gtk3" ]; then + wx_config=wx-config-gtk3 + fi cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_VERSION 1) @@ -31,7 +34,7 @@ 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(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/wx-config) +SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config}) _EOF cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" fi