# HG changeset patch # User Sebastien Jodogne # Date 1584518515 -3600 # Node ID 6d2b94698995d1492e61d6bb2563b17a878626a6 # Parent df164cc69529d8b82023329adf5b36b6a2a36c96 fix for MSVC 32bit diff -r df164cc69529 -r 6d2b94698995 Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake --- a/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake Wed Mar 18 07:57:33 2020 +0100 +++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake Wed Mar 18 09:01:55 2020 +0100 @@ -193,8 +193,16 @@ -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS ) - if (CMAKE_COMPILER_IS_GNUCXX) - # This is MinGW + if (CMAKE_COMPILER_IS_GNUCXX OR # MinGW + "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # MSVC for 32bit (*) + + # (*) With multithreaded logging enabled, Visual Studio 2008 fails + # with error: ".\dcmtk-3.6.5\oflog\libsrc\globinit.cc(422) : error + # C2664: 'dcmtk::log4cplus::thread::impl::tls_init' : cannot + # convert parameter 1 from 'void (__stdcall *)(void *)' to + # 'dcmtk::log4cplus::thread::impl::tls_init_cleanup_func_type'" + # None of the functions with this name in scope match the target type + add_definitions( -DDCMTK_LOG4CPLUS_SINGLE_THREADED )