From 2cc89183df862c1744a6578032803737b64fe467 Mon Sep 17 00:00:00 2001 From: rfranke Date: Tue, 28 Jan 2020 22:02:13 +0100 Subject: [PATCH] Prepend DATADIR only once to LENSFUNDBDIR, see #5622 DATADIR is also prepended to a relative LENSFUNDBDIR in rtengine::init. This removal in CMakeLists.txt keeps the cmake argument LENSFUNDBDIR unmodified in the ~/.config/RawTherapee*/options file. This fixes a path like ../../Resources/../../Resources/./share/lensfun for LENSFUNDBDIR=./share/lensfun under macOS. --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc129eae..7c60fa37c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,10 +252,6 @@ if(NOT DEFINED APPDATADIR) endif() endif() -if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}") - set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}") -endif() - if(APPLE) if("${CODESIGNID}") set(CODESIGNID "${CODESIGNID}" CACHE STRING "Codesigning Identity")