From ceb54979e088a0208a6596568fa617258f99c708 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 28 Apr 2015 11:57:12 +0200
Subject: [PATCH] BUG: avoid calling twice find_package OpenJPEG
---
Modules/ThirdParty/OpenJPEG/CMakeLists.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
index 420a389287..19aa927ab0 100644
--- a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
+++ b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
@@ -3,7 +3,10 @@ project(OTBOpenJPEG)
set(OTBOpenJPEG_SYSTEM_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIRS})
set(OTBOpenJPEG_LIBRARIES "${OPENJPEG_LIBRARIES}")
set(OTBOpenJPEG_INCLUDE_DIRS ${OTBOpenJPEG_BINARY_DIR}/src)
- set(OTBOpenJPEG_EXPORT_CODE_BUILD "find_package(OpenJPEG REQUIRED HINTS ${OpenJPEG_DIR})")
+ set(OTBOpenJPEG_EXPORT_CODE_BUILD "
+if(NOT OpenJPEG_FOUND)
+find_package(OpenJPEG REQUIRED HINTS ${OpenJPEG_DIR})
+endif()")
set(OTBOpenJPEG_EXPORT_CODE_INSTALL ${OTBOpenJPEG_EXPORT_CODE_BUILD})
if(OpenJPEG_FOUND)
@@ -12,6 +15,8 @@ project(OTBOpenJPEG)
configure_file( src/otb_openjpeg.h.in src/otb_openjpeg.h )
endif()
+ message(STATUS "Found OpenJPEG : ${OPENJPEG_LIBRARIES} (version ${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION})")
+
otb_module_impl()
install(FILES ${OTBOpenJPEG_BINARY_DIR}/src/otb_openjpeg.h
--
GitLab