cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mingwlibm' into 'master'

Browse Source 
Don't use libm with libtiff due to conflict with libmsvcrt

See merge request libtiff/libtiff!73
This commit is contained in:
Even Rouault 2020-02-29 18:08:09 +00:00
commit bd03e1a27f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -203,7 +203,9 @@ else()
endif() endif()
# Find libm, if available # Find libm, if available
find_library(M_LIBRARY m) if(NOT MINGW)
find_library(M_LIBRARY m)
endif()
check_include_file(assert.h HAVE_ASSERT_H) check_include_file(assert.h HAVE_ASSERT_H)
check_include_file(dlfcn.h HAVE_DLFCN_H) check_include_file(dlfcn.h HAVE_DLFCN_H)
@ -671,7 +673,7 @@ endif()
# Libraries required by libtiff # Libraries required by libtiff
set(TIFF_LIBRARY_DEPS) set(TIFF_LIBRARY_DEPS)
if(M_LIBRARY) if(NOT MINGW AND M_LIBRARY)
list(APPEND TIFF_LIBRARY_DEPS ${M_LIBRARY}) list(APPEND TIFF_LIBRARY_DEPS ${M_LIBRARY})
endif() endif()
if(ZLIB_LIBRARIES) if(ZLIB_LIBRARIES)