diff --git a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt index b839e87f7d4e6b92d808a7f83df00230ac688871..7b1924ab101c1482668c1e1a71679ed448bd307e 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)