From b21e7c69f1c52d25d3fc5df7bffd80a9114001c0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 2 Nov 2018 17:26:56 +0100 Subject: [PATCH] Replace OPENJPEG_INSTALL_BIN_DIR with CMAKE_INSTALL_BINDIR --- CMakeLists.txt | 6 +----- src/bin/jp2/CMakeLists.txt | 2 +- src/bin/jp3d/CMakeLists.txt | 2 +- src/bin/jpip/CMakeLists.txt | 6 +++--- src/bin/jpwl/CMakeLists.txt | 2 +- src/bin/mj2/CMakeLists.txt | 2 +- src/lib/openjp2/CMakeLists.txt | 2 +- src/lib/openjp2/libopenjp2.pc.cmake.in | 2 +- src/lib/openjp3d/libopenjp3d.pc.cmake.in | 2 +- src/lib/openjpip/CMakeLists.txt | 2 +- src/lib/openjpip/libopenjpip.pc.cmake.in | 2 +- src/lib/openjpwl/CMakeLists.txt | 2 +- src/lib/openjpwl/libopenjpwl.pc.cmake.in | 2 +- 13 files changed, 15 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92153f47..e949f8d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,10 +112,6 @@ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF string(TOLOWER ${PROJECT_NAME} projectname) 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) set(OPENJPEG_INSTALL_LIB_DIR "lib") endif() @@ -144,7 +140,7 @@ endif() if(NOT OPENJPEG_INSTALL_JNI_DIR) if(WIN32) - set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) + set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) else() set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) endif() diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt index 4d4bd952..e648b4b3 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt @@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) # Install exe install(TARGETS ${exe} EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) if(OPJ_USE_DSYMUTIL) add_custom_command(TARGET ${exe} POST_BUILD diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt index 3cac1a8f..ed62b4f3 100644 --- a/src/bin/jp3d/CMakeLists.txt +++ b/src/bin/jp3d/CMakeLists.txt @@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) # Install exe install(TARGETS ${exe} EXPORT OpenJP3DTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) endforeach() diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index 8dbf5775..a7bb0a44 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/src/bin/jpip/CMakeLists.txt @@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) # Install exe install(TARGETS opj_jpip_addxml EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) if(BUILD_JPIP_SERVER) @@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) # Install exe install(TARGETS opj_server EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) endif() @@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) target_link_libraries(${exe} openjpip) install(TARGETS ${exe} EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) endforeach() diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt index 5df225de..8a798e61 100644 --- a/src/bin/jpwl/CMakeLists.txt +++ b/src/bin/jpwl/CMakeLists.txt @@ -57,6 +57,6 @@ foreach(exe decompress compress) endif() install(TARGETS ${jpwl_exe} - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) endforeach() diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt index 5d3e288b..6669c502 100644 --- a/src/bin/mj2/CMakeLists.txt +++ b/src/bin/mj2/CMakeLists.txt @@ -43,5 +43,5 @@ foreach(exe endif() install(TARGETS ${exe} - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) + DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach() diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 9f79b9c3..e41680d3 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -114,7 +114,7 @@ endif() # Install library install(TARGETS ${INSTALL_LIBS} 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 ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries ) diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in index 62159b00..05000152 100644 --- a/src/lib/openjp2/libopenjp2.pc.cmake.in +++ b/src/lib/openjp2/libopenjp2.pc.cmake.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ +bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in index e9b6c404..279f309b 100644 --- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in +++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ +bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt index b3cb8ce8..b6d5edfd 100644 --- a/src/lib/openjpip/CMakeLists.txt +++ b/src/lib/openjpip/CMakeLists.txt @@ -74,7 +74,7 @@ endif() # Install library install(TARGETS openjpip 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 ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries ) diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in index 7c3f29af..0a25fa78 100644 --- a/src/lib/openjpip/libopenjpip.pc.cmake.in +++ b/src/lib/openjpip/libopenjpip.pc.cmake.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ +bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt index 1b33adbe..3bf28f6f 100644 --- a/src/lib/openjpwl/CMakeLists.txt +++ b/src/lib/openjpwl/CMakeLists.txt @@ -58,7 +58,7 @@ endif() # Install library install(TARGETS openjpwl 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 ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries ) diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in index b1244197..caa808d2 100644 --- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in +++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ +bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@