diff --git a/.appveyor.yml b/.appveyor.yml
index a969ebb0edb6302a727563a80ee2a070786f01de..162259087369d49f59a18aa78981e01575a9faf8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -32,7 +32,7 @@ before_build:
 build_script:
 - mkdir build
 - cd build
-- cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INCLUDE_PATH=C:/opt/local_x64/include -DCMAKE_LIBRARY_PATH=C:/opt/local_x64/lib ..
+- cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INCLUDE_PATH=C:/opt/local_x64/include ..
 - cmake --build . --config Release
 
 test_script:
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index e8105fcf1d73b595ba628da865d390b707f9abc7..a412c114ff7979bbe0965a22fe0d310f513ba13b 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -228,8 +228,8 @@ if(WIN32)
         DESTINATION ${destination_lib} COMPONENT Libraries)
 
     install(FILES
-        ${CMAKE_LIBRARY_PATH}/libfftw3-3.dll
-        ${CMAKE_LIBRARY_PATH}/libtiff.dll
+        ${FFTW_LIBRARY_DLL}
+        ${TIFF_LIBRARY_DLL}
         DESTINATION ${destination_lib} COMPONENT Libraries)
 
 else()
diff --git a/cmake/generic/modules/FindFFTW.cmake b/cmake/generic/modules/FindFFTW.cmake
index 70e0de78f5c3934b8c7085c85f9b2012b1d9e148..51609d09fd7ddb0de3eba69f925a54ba27f3eacb 100644
--- a/cmake/generic/modules/FindFFTW.cmake
+++ b/cmake/generic/modules/FindFFTW.cmake
@@ -33,18 +33,23 @@ if(NOT WIN32)
     )
 else()
     find_path(FFTW_INCLUDE_DIR fftw3.h
-        $ENV{FFTW_DIR}/include
-        "C:/opt/local/include"
+        HINTS ENV PATH
+        PATHS "C:/opt/local_x64/include"  # if fftw cannot be found in env path
+        PATH_SUFFIXES ../include
+        NO_DEFAULT_PATH
     )
 #    message("XXX ${FFTW_INCLUDE_DIR}")
 
-    find_library(FFTW_LIBRARY NAMES libfftw3-3 PATHS
-        $ENV{FFTW_DIR}/lib
-        $ENV{FFTW3} $ENV{FFTW3}/lib $ENV{FFTW3}/.libs
-        "C:/opt/local/lib"
+    find_library(FFTW_LIBRARY libfftw3-3
+        HINTS ENV PATH
+        PATHS "C:/opt/local_x64/lib"  # if fftw cannot be found in env path
+        NO_DEFAULT_PATH
     )
-#    message("XXX ${FFTW_LIBRARY}")
-    
+
+    string( REPLACE ".lib" ".dll" FFTW_LIBRARY_DLL "${FFTW_LIBRARY}" )
+    if (NOT EXISTS ${FFTW_LIBRARY_DLL})
+        message(FATAL_ERROR "File ${FFTW_LIBRARY_DLL} does not exist")
+    endif (NOT EXISTS ${FFTW_LIBRARY_DLL})
 endif()
 
 if(FFTW_INCLUDE_DIR AND FFTW_LIBRARY)
@@ -65,4 +70,4 @@ endif()
 
 set(FFTW_LIBRARIES ${FFTW_LIBRARY})
 
-mark_as_advanced(FFTW_FOUND FFTW_LIBRARY FFTW_INCLUDE_DIR)
+mark_as_advanced(FFTW_FOUND FFTW_LIBRARY FFTW_INCLUDE_DIR FFTW_LIBRARY_DLL)
diff --git a/cmake/generic/modules/FindTIFF.cmake b/cmake/generic/modules/FindTIFF.cmake
index 15e3d8a1c5856f2259e51eed04eb880fc5200aea..ecd840a63391e4bacada4f236ede5ce98eb5e62c 100644
--- a/cmake/generic/modules/FindTIFF.cmake
+++ b/cmake/generic/modules/FindTIFF.cmake
@@ -69,7 +69,12 @@ if(TIFF_FOUND)
             message(STATUS "Found TIFF C++ library ${cpp_tiff_library}")
             set(TIFF_LIBRARIES ${TIFF_LIBRARIES};${cpp_tiff_library})
         endif()
-    endif()
+    else()
+        string( REPLACE ".lib" ".dll" TIFF_LIBRARY_DLL "${TIFF_LIBRARY}" )
+        if (NOT EXISTS ${TIFF_LIBRARY_DLL})
+            message(FATAL_ERROR "File ${TIFF_LIBRARY_DLL} does not exist")
+        endif (NOT EXISTS ${TIFF_LIBRARY_DLL})
+    endif(NOT WIN32)
 endif()
 
-mark_as_advanced(TIFF_INCLUDE_DIR TIFF_LIBRARY)
+mark_as_advanced(TIFF_INCLUDE_DIR TIFF_LIBRARY TIFF_LIBRARY_DLL)