diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 13:59:12 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 13:59:12 +0000 |
| commit | 07ef7d750b9cabf65628e89cda2719274a30cbd8 (patch) | |
| tree | 6048c6d1ccb223b9c0a96c13b2c7552ff93f6cff | |
| parent | ea2b1d36aa3ad8d260bf6fe91907b19e9c5f2e25 (diff) | |
[trunk] Synchronize with 1.5 branch, installation convention
| -rw-r--r-- | libopenjpeg/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt index 7e7da3d4..c8a66267 100644 --- a/libopenjpeg/CMakeLists.txt +++ b/libopenjpeg/CMakeLists.txt @@ -49,15 +49,15 @@ ENDIF(BUILD_JPWL) # Install library INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries + ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries ) # Install includes files INSTALL(FILES openjpeg.h - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers + DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers ) -INSTALL(CODE - "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") # install man page of the library INSTALL( |