From 655cdb5dfad07462055a7eb74015f4940b3d5499 Mon Sep 17 00:00:00 2001 From: Niclas Rosenvik <youremailsarecrap@gmail.com> Date: Sun, 27 Oct 2019 11:39:08 +0000 Subject: [PATCH 1/4] Make finding version specific include dirs for openjpeg prefix independent Use PATH_SUFFIXES to find version specific include dirs for openjpeg. This is better than hardcoding them in PATH since it works for any prefix used by cmake. Makes prefix independent package systems (such as pkgsrc) find openjpeg. --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebb96ac..26fb414 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,17 +108,12 @@ find_path(OPENJPEG_INCLUDE_DIR ~/Library/Frameworks/include /Library/Frameworks/include /usr/local/include - /usr/local/include/openjpeg-2.3 - /usr/include/openjpeg-2.3 - /usr/local/include/openjpeg-2.1 - /usr/include/openjpeg-2.1 - /usr/local/include/openjpeg-2.2 - /usr/include/openjpeg-2.2 /usr/include /sw/include # Fink /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include + PATH_SUFFIXES openjpeg-2.3 openjpeg-2.2 openjpeg-2.1 REQUIRED ) include_directories(${OPENJPEG_INCLUDE_DIR}) -- 2.37.1