Mirrors/libtiff
0
0
Fork 0
mirror of https://gitlab.com/libtiff/libtiff.git synced 2026-01-18 21:51:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Replace CMath::CMath with direct link to avoid export

Browse Source 
Link with CMATH_LIBRARIES instead of CMath::CMath.  While this
will still be exported, it will be available on the host system.

Port of original commit:
67f73084ca

co-authored: Roger Leigh <rleigh@codelibre.net>
This commit is contained in:
Reinhold Gschweicher
2025-09-15 13:02:53 +02:00
parent 5fe20d0e9a
commit 25d17e1718
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/FindCMath.cmake
View File

@@ -55,18 +55,11 @@ if(CMath_FOUND)
set(CMath_INCLUDE_DIRS)
endif()
if(NOT CMath_LIBRARIES)
if (NOT CMath_LIBRARY)
unset(CMath_LIBRARY)
endif()
if (CMath_LIBRARY)
set(CMath_LIBRARIES ${CMath_LIBRARY})
endif()
endif()
if(NOT TARGET CMath::CMath)
if(CMath_LIBRARIES)
add_library(CMath::CMath UNKNOWN IMPORTED)
set_target_properties(CMath::CMath PROPERTIES
IMPORTED_LOCATION "${CMath_LIBRARY}")
else()
add_library(CMath::CMath INTERFACE IMPORTED)
endif()
endif()
endif()

4
contrib/dbs/CMakeLists.txt
View File

@@ -28,7 +28,7 @@ target_link_libraries(tiff-bi tiff tiff_port)
add_executable(tiff-grayscale tiff-grayscale.c)
set_target_properties(tiff-grayscale PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(tiff-grayscale tiff tiff_port CMath::CMath)
target_link_libraries(tiff-grayscale tiff tiff_port ${CMath_LIBRARIES})
add_executable(tiff-palette tiff-palette.c)
set_target_properties(tiff-palette PROPERTIES LINKER_LANGUAGE CXX)
@@ -36,7 +36,7 @@ target_link_libraries(tiff-palette tiff tiff_port)
add_executable(tiff-rgb tiff-rgb.c)
set_target_properties(tiff-rgb PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(tiff-rgb tiff tiff_port CMath::CMath)
target_link_libraries(tiff-rgb tiff tiff_port ${CMath_LIBRARIES})
if(WEBP_SUPPORT AND EMSCRIPTEN)
# Emscripten is pretty finnicky about linker flags.

4
libtiff/CMakeLists.txt
View File

@@ -180,8 +180,8 @@ if(WEBP_SUPPORT)
string(APPEND tiff_requires_private " libwebp")
endif()
if(CMath_LIBRARY)
target_link_libraries(tiff PRIVATE CMath::CMath)
list(APPEND tiff_libs_private_list "${CMath_LIBRARY}")
target_link_libraries(tiff PRIVATE ${CMath_LIBRARIES})
list(APPEND tiff_libs_private_list "${CMath_LIBRARIES}")
endif()
set(tiff_libs_private_list "${tiff_libs_private_list}" PARENT_SCOPE)

8
tools/CMakeLists.txt
View File

@@ -53,7 +53,7 @@ target_link_libraries(ppm2tiff PRIVATE tiff tiff_port)
add_executable(raw2tiff ../placeholder.h)
target_sources(raw2tiff PRIVATE raw2tiff.c ${MSVC_RESOURCE_FILE})
set_target_properties(raw2tiff PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(raw2tiff PRIVATE tiff tiff_port CMath::CMath)
target_link_libraries(raw2tiff PRIVATE tiff tiff_port ${CMath_LIBRARIES})
add_executable(rgb2ycbcr ../placeholder.h)
target_sources(rgb2ycbcr PRIVATE rgb2ycbcr.c ${MSVC_RESOURCE_FILE})
@@ -63,7 +63,7 @@ target_link_libraries(rgb2ycbcr PRIVATE tiff tiff_port)
add_executable(thumbnail ../placeholder.h)
target_sources(thumbnail PRIVATE thumbnail.c ${MSVC_RESOURCE_FILE})
set_target_properties(thumbnail PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(thumbnail PRIVATE tiff tiff_port CMath::CMath)
target_link_libraries(thumbnail PRIVATE tiff tiff_port ${CMath_LIBRARIES})
add_executable(tiff2bw ../placeholder.h)
target_sources(tiff2bw PRIVATE tiff2bw.c ${MSVC_RESOURCE_FILE})
@@ -78,7 +78,7 @@ target_link_libraries(tiff2pdf PRIVATE tiff tiff_port)
add_executable(tiff2ps ../placeholder.h)
target_sources(tiff2ps PRIVATE tiff2ps.c ${MSVC_RESOURCE_FILE})
set_target_properties(tiff2ps PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(tiff2ps PRIVATE tiff tiff_port CMath::CMath)
target_link_libraries(tiff2ps PRIVATE tiff tiff_port ${CMath_LIBRARIES})
add_executable(tiff2rgba ../placeholder.h)
target_sources(tiff2rgba PRIVATE tiff2rgba.c ${MSVC_RESOURCE_FILE})
@@ -98,7 +98,7 @@ target_link_libraries(tiffcp PRIVATE tiff tiff_port)
add_executable(tiffcrop ../placeholder.h)
target_sources(tiffcrop PRIVATE tiffcrop.c ${MSVC_RESOURCE_FILE})
set_target_properties(tiffcrop PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(tiffcrop PRIVATE tiff tiff_port CMath::CMath)
target_link_libraries(tiffcrop PRIVATE tiff tiff_port ${CMath_LIBRARIES})
add_executable(tiffdither ../placeholder.h)
target_sources(tiffdither PRIVATE tiffdither.c ${MSVC_RESOURCE_FILE})