Don't clobber openjpeg.h from jp3d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57c807d8b9353909d203b78d356362d4d73292ab..98880ac3866ec36a4586c982606ff2f2f290ff1d 100644 (file)
--- 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 3f1e34b692ad1989716cb21e98b561ff47dfc26d..7f0496c7880ddc62e43fe433880c7604238f0b6f 100644 (file)
--- 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 bc744d094e65df87dabecf01e66975eacf6481fa..20fb780c41262e667898efb5d2a06e5b29a684ef 100644 (file)
--- 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
 )