From 968471abe598ca5fa3446b4658ec4dc5bd4028d4 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 2 Nov 2018 18:08:22 +0100 Subject: [PATCH] Set OPENJPEG_INSTALL_PACKAGE_DIR to expected standard location Should be ported to CMakePackageConfigHelpers in the future, but this will do for now. --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23ccbff8..a0e0e7fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,10 +122,7 @@ if(NOT OPENJPEG_INSTALL_JNI_DIR) endif() if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) - # We could install *.cmake files in share/ however those files contains - # hardcoded path to libraries on a multi-arch system (fedora/debian) those - # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) - set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/${OPENJPEG_INSTALL_SUBDIR}") + set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") endif() if (APPLE)