diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/PkgConfig.cmake | 6 | ||||
| -rwxr-xr-x | libtiff/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | man/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | tools/CMakeLists.txt | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b4c6df2..770b0fac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ include(SymbolChecks) # Standard installation paths include(GNUInstallDirs) # Documentation install directory (default to cmake project docdir) -set(LIBTIFF_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}") +set(LIBTIFF_DOCDIR "${CMAKE_INSTALL_DOCDIR}") # CTest testing enable_testing() diff --git a/cmake/PkgConfig.cmake b/cmake/PkgConfig.cmake index dc251674..7796a6b7 100644 --- a/cmake/PkgConfig.cmake +++ b/cmake/PkgConfig.cmake @@ -48,12 +48,12 @@ endfunction() # Generate pkg-config file set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "${CMAKE_INSTALL_PREFIX}") -set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") -set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") +set(libdir "${CMAKE_INSTALL_LIBDIR}") +set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") set_libs_private(tiff_libs_private ${tiff_libs_private_list}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtiff-4.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libtiff-4.pc) # Install pkg-config file install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtiff-4.pc - DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt index cf9d80c3..b6b31677 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -171,12 +171,12 @@ endif() export(TARGETS tiff NAMESPACE TIFF:: FILE "${CMAKE_CURRENT_BINARY_DIR}/libtiffTargets.cmake") install(TARGETS tiff EXPORT TiffTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${tiff_public_HEADERS} - DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") set(TIFF_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/tiff) install(EXPORT TiffTargets @@ -208,12 +208,12 @@ if(CXX_SUPPORT) endif() install(TARGETS tiffxx - RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${tiffxx_HEADERS} - DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") endif() diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index ea2998d1..0812c60c 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -90,6 +90,6 @@ set(man3_MANS TIFFWriteTile.3tiff) install(FILES ${man1_MANS} - DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") install(FILES ${man3_MANS} - DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man3") + DESTINATION "${CMAKE_INSTALL_MANDIR}/man3") diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 69949b9e..ac64bd84 100755 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -122,7 +122,7 @@ install(TARGETS fax2ps tiffmedian tiffset tiffsplit - RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") if(HAVE_OPENGL) add_executable(tiffgt ../placeholder.h) @@ -131,7 +131,7 @@ if(HAVE_OPENGL) target_link_libraries(tiffgt PRIVATE OpenGL::GL GLUT::GLUT) install(TARGETS tiffgt - RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") endif() if(WEBP_SUPPORT AND EMSCRIPTEN) |