diff options
| author | Timothy Lyanguzov <theta682@gmail.com> | 2022-10-04 16:38:06 +0000 |
|---|---|---|
| committer | Jeremy Maitin-Shepard <jeremy@jeremyms.com> | 2022-10-04 16:38:06 +0000 |
| commit | 7d0ed2ed5ed5d0bba1603bdbd098997a881ef255 (patch) | |
| tree | 86ef8713f7497d1150121e33628564e3c881c678 | |
| parent | 814a2441e76b54bfc2d4dd8961a9b43d996bcc0c (diff) | |
| download | libtiff-git-7d0ed2ed5ed5d0bba1603bdbd098997a881ef255.tar.gz | |
Apply 9 suggestion(s) to 3 file(s)
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/ZSTDCodec.cmake | 4 | ||||
| -rwxr-xr-x | libtiff/CMakeLists.txt | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 02e3ed83..0f346627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,12 +45,12 @@ project(tiff VERSION "${LIBTIFF_VERSION}" LANGUAGES C CXX) -if(NOT "^${CMAKE_SOURCE_DIR}$" STREQUAL "^${PROJECT_SOURCE_DIR}$") +if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # libtiff is being included as a subproject of some other project. - set(tiff-install-default OFF) - set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries") + set(TIFF_INSTALL_DEFAULT OFF) + option(BUILD_SHARED_LIBS "Build shared libraries" ON) else() - set(tiff-install-default ON) + set(TIFF_INSTALL_DEFAULT ON) set(tiff-install ON) endif() @@ -59,7 +59,7 @@ option(tiff-tests "build TIFF tests" ON) option(tiff-contrib "build TIFF contrib" ON) option(tiff-docs "build TIFF documentation" ON) option(tiff-deprecated "build TIFF deprecated features" OFF) -option(tiff-install "install TIFF targets" ${tiff-install-default}) +option(tiff-install "install TIFF targets" ${TIFF_INSTALL_DEFAULT}) # Disable deprecated features to ensure clean build if (tiff-deprecated) diff --git a/cmake/ZSTDCodec.cmake b/cmake/ZSTDCodec.cmake index 506e53c2..490d75c4 100644 --- a/cmake/ZSTDCodec.cmake +++ b/cmake/ZSTDCodec.cmake @@ -31,7 +31,7 @@ set(ZSTD_USABLE FALSE) find_package(ZSTD) if(ZSTD_FOUND) - if (NOT (DEFINED ZSTD_HAVE_DECOMPRESS_STREAM)) + if(NOT DEFINED ZSTD_HAVE_DECOMPRESS_STREAM) set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZSTD_INCLUDE_DIRS}) set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) @@ -40,7 +40,7 @@ if(ZSTD_FOUND) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) endif() - set(ZSTD_RECENT_ENOUGH "${ZSTD_HAVE_DECOMPRESS_STREAM}") + set(ZSTD_RECENT_ENOUGH ${ZSTD_HAVE_DECOMPRESS_STREAM}) if (ZSTD_RECENT_ENOUGH) set(ZSTD_USABLE TRUE) diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt index 57f29b1f..346c2f0d 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -170,7 +170,7 @@ if(HAVE_LD_VERSION_SCRIPT) "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") endif() -if (tiff-install) +if(tiff-install) export(TARGETS tiff NAMESPACE TIFF:: FILE "${CMAKE_CURRENT_BINARY_DIR}/libtiffTargets.cmake") install(TARGETS tiff EXPORT TiffTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -218,7 +218,7 @@ if(CXX_SUPPORT) "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiffxx.map") endif() - if (tiff-install) + if(tiff-install) install(TARGETS tiffxx RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |