Mercurial > hg > orthanc

changeset 1544:4d0e2c38d15b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix msvc build
author jodogne
date Thu, 13 Aug 2015 20:39:30 +0200
parents 8b6d8f9b9f71
children 33d34bc4ac15
files Resources/CMake/LibCurlConfiguration.cmake Resources/CMake/LibPngConfiguration.cmake
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/LibCurlConfiguration.cmake	Thu Aug 13 17:26:46 2015 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Thu Aug 13 20:39:30 2015 +0200
@@ -51,10 +51,7 @@
     file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n")
   endforeach()
 
-  if (MSVC)
-    add_definitions(-DHAVE_BOOL_T=1)
-
-  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
+  if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
       ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
       ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
       ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
--- a/Resources/CMake/LibPngConfiguration.cmake	Thu Aug 13 17:26:46 2015 +0200
+++ b/Resources/CMake/LibPngConfiguration.cmake	Thu Aug 13 20:39:30 2015 +0200
@@ -12,7 +12,7 @@
   configure_file(
     ${LIBPNG_SOURCES_DIR}/scripts/pnglibconf.h.prebuilt
     ${LIBPNG_SOURCES_DIR}/pnglibconf.h
-    COPY_ONLY)
+    )
 
   set(LIBPNG_SOURCES
     #${LIBPNG_SOURCES_DIR}/example.c