From 017a553b993bd00fc25f56d2f098cb2ece6bae19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 13 Oct 2024 21:11:50 +0200 Subject: [PATCH] cmake_gui: fix data and other path variables to match the main package For the data path, this is essential so that it finds the data files. Clarify in the description that this must be installed in the same prefix as the main package. (the data path definition is relative) --- dev-build/cmake/cmake_gui-3.30.5.recipe | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-build/cmake/cmake_gui-3.30.5.recipe b/dev-build/cmake/cmake_gui-3.30.5.recipe index 4ba548164..deeb2d52e 100644 --- a/dev-build/cmake/cmake_gui-3.30.5.recipe +++ b/dev-build/cmake/cmake_gui-3.30.5.recipe @@ -5,11 +5,12 @@ simple platform and compiler independent configuration files. CMake generates \ native makefiles and workspaces that can be used in the compiler environment \ of your choice. -This package provides the GUI version of CMake (cmake-gui)" +This package provides the GUI version of CMake (cmake-gui). It must be \ +installed in the same prefix as the main cmake package." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2024 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="1" +REVISION="2" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d" SOURCE_DIR="cmake-$portVersion" @@ -78,11 +79,16 @@ defineDebugInfoPackage cmake_gui$secondaryArchSuffix \ BUILD() { + # the CMAKE_*_DIR variables should match the definitions in the cmake recipe cmake -Bbuild-gui -S. $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=bin \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DBUILD_CursesDialog=OFF \ -DBUILD_QtDialog=ON \ + -DCMAKE_DATA_DIR=/$relativeDataDir/cmake \ + -DCMAKE_DOC_DIR=/$relativeDocumentationDir/packages/cmake \ + -DCMAKE_MAN_DIR=/$relativeManDir \ + -DCMAKE_XDGDATA_DIR=/$relativeDataDir \ -DCMAKE_USE_SYSTEM_BZIP2=ON \ -DCMAKE_USE_SYSTEM_CPPDAP=ON \ -DCMAKE_USE_SYSTEM_CURL=ON \