From bb9232c9d9d5e8ea3a2de36f20adac72c15127af Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 22 Oct 2010 18:41:49 +0000
Subject: [PATCH] Don't clobber openjpeg.h from jp3d

---
 CMakeLists.txt                | 2 +-
 jp3d/libjp3dvm/CMakeLists.txt | 4 +++-
 libopenjpeg/CMakeLists.txt    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57c807d8..98880ac3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ IF(NOT OPENJPEG_INSTALL_DATA_DIR)
 ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
 
 IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${subdir}")
+  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
 ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
 
 IF(NOT OPENJPEG_INSTALL_MAN_DIR)
diff --git a/jp3d/libjp3dvm/CMakeLists.txt b/jp3d/libjp3dvm/CMakeLists.txt
index 3f1e34b6..7f0496c7 100644
--- a/jp3d/libjp3dvm/CMakeLists.txt
+++ b/jp3d/libjp3dvm/CMakeLists.txt
@@ -22,4 +22,6 @@ ADD_LIBRARY(${OPJ_PREFIX}openjp3dvm ${JP3DVM_SRCS})
 INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm)
 
 # Install includes files
-INSTALL_FILES(/include/${subdir} openjpeg.h)
+INSTALL(FILES openjpeg.h
+  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}
+  RENAME openjpeg3d.h)
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index bc744d09..20fb780c 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -48,5 +48,5 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 
 # Install includes files
 INSTALL(FILES openjpeg.h
-	DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
+  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers
 )