# HG changeset patch # User Sebastien Jodogne # Date 1477566177 -7200 # Node ID 2e5db9b72a7b0d83175dff3f4379a11be39b4558 # Parent 952b2c6ee0a2ea3ecaeaf81473f3edbd1968832e fix msvc diff -r 952b2c6ee0a2 -r 2e5db9b72a7b Applications/CMakeLists.txt --- a/Applications/CMakeLists.txt Thu Oct 27 12:47:32 2016 +0200 +++ b/Applications/CMakeLists.txt Thu Oct 27 13:02:57 2016 +0200 @@ -207,17 +207,17 @@ # Mandatory components ${BOOST_SOURCES} + ${CURL_SOURCES} + ${DCMTK_SOURCES} ${JSONCPP_SOURCES} - ${ZLIB_SOURCES} + ${LIBJPEG_SOURCES} ${LIBPNG_SOURCES} - ${LIBJPEG_SOURCES} - ${DCMTK_SOURCES} ${LIBTIFF_SOURCES} ${OPENJPEG_SOURCES} + ${ZLIB_SOURCES} # Optional components ${OPENSSL_SOURCES} - ${CURL_SOURCES} ) diff -r 952b2c6ee0a2 -r 2e5db9b72a7b Resources/CMake/LibTiffConfiguration.cmake --- a/Resources/CMake/LibTiffConfiguration.cmake Thu Oct 27 12:47:32 2016 +0200 +++ b/Resources/CMake/LibTiffConfiguration.cmake Thu Oct 27 13:02:57 2016 +0200 @@ -14,9 +14,14 @@ ") file(WRITE ${LIBTIFF_SOURCES_DIR}/libtiff/tiffconf.h " #if defined(_MSC_VER) -# define WIN32_LEAN_AND_MEAN -# include -typedef SSIZE_T ssize_t; +# if !defined(ssize_t) +# define WIN32_LEAN_AND_MEAN +# include +# define ssize_t SSIZE_T +# endif +# if !defined(snprintf) +# define snprintf _snprintf +# endif #endif #include