Replace OPENJPEG_INSTALL_BIN_DIR with CMAKE_INSTALL_BINDIR
This commit is contained in:
parent
e7b77afb66
commit
44f172de49
|
@ -113,10 +113,6 @@ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF
|
||||||
string(TOLOWER ${PROJECT_NAME} projectname)
|
string(TOLOWER ${PROJECT_NAME} projectname)
|
||||||
set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_BIN_DIR)
|
|
||||||
set(OPENJPEG_INSTALL_BIN_DIR "bin")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_LIB_DIR)
|
if(NOT OPENJPEG_INSTALL_LIB_DIR)
|
||||||
set(OPENJPEG_INSTALL_LIB_DIR "lib")
|
set(OPENJPEG_INSTALL_LIB_DIR "lib")
|
||||||
endif()
|
endif()
|
||||||
|
@ -145,7 +141,7 @@ endif()
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_JNI_DIR)
|
if(NOT OPENJPEG_INSTALL_JNI_DIR)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
|
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
|
||||||
else()
|
else()
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
|
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
|
||||||
# Install exe
|
# Install exe
|
||||||
install(TARGETS ${exe}
|
install(TARGETS ${exe}
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
)
|
)
|
||||||
if(OPJ_USE_DSYMUTIL)
|
if(OPJ_USE_DSYMUTIL)
|
||||||
add_custom_command(TARGET ${exe} POST_BUILD
|
add_custom_command(TARGET ${exe} POST_BUILD
|
||||||
|
|
|
@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
|
||||||
# Install exe
|
# Install exe
|
||||||
install(TARGETS opj_jpip_addxml
|
install(TARGETS opj_jpip_addxml
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
)
|
)
|
||||||
|
|
||||||
if(BUILD_JPIP_SERVER)
|
if(BUILD_JPIP_SERVER)
|
||||||
|
@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
|
||||||
# Install exe
|
# Install exe
|
||||||
install(TARGETS opj_server
|
install(TARGETS opj_server
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
|
||||||
target_link_libraries(${exe} openjpip)
|
target_link_libraries(${exe} openjpip)
|
||||||
install(TARGETS ${exe}
|
install(TARGETS ${exe}
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
)
|
)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ endif()
|
||||||
# Install library
|
# Install library
|
||||||
install(TARGETS ${INSTALL_LIBS}
|
install(TARGETS ${INSTALL_LIBS}
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
||||||
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
prefix=@CMAKE_INSTALL_PREFIX@
|
prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
|
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
|
||||||
|
|
|
@ -74,7 +74,7 @@ endif()
|
||||||
# Install library
|
# Install library
|
||||||
install(TARGETS openjpip
|
install(TARGETS openjpip
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
||||||
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
prefix=@CMAKE_INSTALL_PREFIX@
|
prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
|
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
|
||||||
|
|
Loading…
Reference in New Issue