From 98f239edf8cc26d3aefad26d9729f1a788a390cb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 27 Dec 2020 00:24:26 +0100 Subject: [PATCH] build-style/cmake.sh: remove handeling of wxWidgets when cross compiing This can be potentially broken, and the preffered way is to just set the WX_CONFIG env variable --- common/build-style/cmake.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 136312ed7b..3135508b8b 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -33,9 +33,6 @@ _EOF ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;; *) _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) @@ -51,8 +48,6 @@ SET(CMAKE_FIND_ROOT_PATH "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}") 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:=wx-config}) _EOF cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" fi