Libtiff and win32 fix (absent nprintf function)

ThirdParty/CMakeLists.txt

@@ -2,6 +2,7 @@
 
 if(BORNAGAIN_TIFF_SUPPORT)
     if(NOT TIFF_FOUND)
+        message(INFO "aaa adding tiff")
         add_subdirectory(libtiff)
     endif()
 endif()

ThirdParty/libtiff/CMakeLists.txt

@@ -63,7 +63,6 @@ set(include_files
     tiffconf.h
 )
 
-
 if(WIN32)
     list(APPEND source_files ${libtiff_source_dir}/tif_win32.c)
 else()
@@ -71,8 +70,8 @@ else()
 endif()
 
 
-set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${libtiff_source_dir})
-#set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
+#set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${libtiff_source_dir})
+set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${include_dirs})
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_POINTER_SIZE=${CMAKE_SIZEOF_VOID_P}")
@@ -96,8 +95,8 @@ set(${library_name}_LIBRARY_TYPE SHARED)
 # exposing paths for library users
 #set(${library_name}_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
 #set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
-set(TIFF_INCLUDE_DIR ${include_dirs} PARENT_SCOPE)
-set(TIFF_LIBRARIES ${library_name} PARENT_SCOPE)
+set(TIFF_INCLUDE_DIR ${include_dirs} CACHE INTERNAL "")
+set(TIFF_LIBRARIES ${library_name} CACHE INTERNAL "")
 
 
 target_link_libraries(${library_name} ${M_LIBRARY})

ThirdParty/libtiff/tif_config.h

@@ -98,7 +98,9 @@
 
 /* Define to 1 if you have the `snprintf' function. */
 /* #undef HAVE_SNPRINTF */
+#ifdef _WIN32
 #define HAVE_SNPRINTF
+#endif
 
 /* Define to 1 if you have the `sqrt' function. */
 /* #undef HAVE_SQRT */