walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Don't clobber openjpeg.h from jp3d

This commit is contained in:
Ben Boeckel 2010-10-22 18:41:49 +00:00
parent 87cb9efb99
commit bb9232c9d9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -92,7 +92,7 @@ IF(NOT OPENJPEG_INSTALL_DATA_DIR)
ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
IF(NOT OPENJPEG_INSTALL_INCLUDE_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) ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
IF(NOT OPENJPEG_INSTALL_MAN_DIR) IF(NOT OPENJPEG_INSTALL_MAN_DIR)

4
jp3d/libjp3dvm/CMakeLists.txt
View File

@ -22,4 +22,6 @@ ADD_LIBRARY(${OPJ_PREFIX}openjp3dvm ${JP3DVM_SRCS})
INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm) INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm)
# Install includes files # 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)

2
libopenjpeg/CMakeLists.txt
View File

@ -48,5 +48,5 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
# Install includes files # Install includes files
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers
) )