Mercurial > hg > orthanc
comparison Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake @ 3774:6d2b94698995
fix for MSVC 32bit
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 18 Mar 2020 09:01:55 +0100 |
parents | df164cc69529 |
children | 05a363186da6 |
comparison
equal
deleted
inserted
replaced
3773:df164cc69529 | 3774:6d2b94698995 |
---|---|
191 # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll | 191 # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll |
192 add_definitions( | 192 add_definitions( |
193 -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS | 193 -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS |
194 ) | 194 ) |
195 | 195 |
196 if (CMAKE_COMPILER_IS_GNUCXX) | 196 if (CMAKE_COMPILER_IS_GNUCXX OR # MinGW |
197 # This is MinGW | 197 "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # MSVC for 32bit (*) |
198 | |
199 # (*) With multithreaded logging enabled, Visual Studio 2008 fails | |
200 # with error: ".\dcmtk-3.6.5\oflog\libsrc\globinit.cc(422) : error | |
201 # C2664: 'dcmtk::log4cplus::thread::impl::tls_init' : cannot | |
202 # convert parameter 1 from 'void (__stdcall *)(void *)' to | |
203 # 'dcmtk::log4cplus::thread::impl::tls_init_cleanup_func_type'" | |
204 # None of the functions with this name in scope match the target type | |
205 | |
198 add_definitions( | 206 add_definitions( |
199 -DDCMTK_LOG4CPLUS_SINGLE_THREADED | 207 -DDCMTK_LOG4CPLUS_SINGLE_THREADED |
200 ) | 208 ) |
201 endif() | 209 endif() |
202 endif() | 210 endif() |