From 8bb74331c383bf53bfc953b48f6bb2d65e335029 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Wed, 30 Apr 2008 08:33:35 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20fichiers=20CMake?=
=?UTF-8?q?=20OpenJPEG=20:=20pou=20rinstall=20et=20option=20-w=20compilati?=
=?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
index b839e87f7d..7b1924ab10 100755
--- a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
@@ -25,11 +25,11 @@ SET(OPENJPEG_SRCS
)
# disable gcc warnings
-IF(CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_COMPILER_IS_GNUCC)
FOREACH(f ${OPENJPEG_SRCS})
SET_SOURCE_FILES_PROPERTIES( ${f} PROPERTIES COMPILE_FLAGS -w )
ENDFOREACH(f)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
# Pass proper definition to preprocessor to generate shared lib
IF(WIN32)
@@ -51,8 +51,12 @@ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
# Install library
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
- DESTINATION lib)
+RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+
# Install includes files
INSTALL(FILES openjpeg.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/openjpeg)
+ DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg
+ COMPONENT Development)
--
GitLab