diff --git a/Utilities/CAI/CMakeLists.txt b/Utilities/CAI/CMakeLists.txt
index 67c9d93e9cec44fe29b174bf4d344fcc10617286..f53bbb202fc9e232b79ebbda7b7b58eab39fd26f 100755
--- a/Utilities/CAI/CMakeLists.txt
+++ b/Utilities/CAI/CMakeLists.txt
@@ -2,9 +2,10 @@
 # $Id$
 #
 
-IF(WIN32)
-   SUBDIRS(cai_dll)
-ELSE(WIN32)
+
+IF(UNIX OR CYGWIN OR MINGW)
    ADD_DEFINITIONS(-D_NOHDF16)
    SUBDIRS(src inc)
-ENDIF(WIN32)
+ELSE(UNIX OR CYGWIN OR MINGW)
+   SUBDIRS(cai_dll)
+ENDIF(UNIX OR CYGWIN OR MINGW)
diff --git a/Utilities/CAI/caiIncludeDirectories.cmake b/Utilities/CAI/caiIncludeDirectories.cmake
index b17e8cec587995c2f6866a7581815a9ce044de3f..464daafd08c3156148605e7935d260867a1a4b17 100755
--- a/Utilities/CAI/caiIncludeDirectories.cmake
+++ b/Utilities/CAI/caiIncludeDirectories.cmake
@@ -1,18 +1,16 @@
 # $Id$
 
-
 #-----------------------------------------------------------------------------
 # Include directories from the build tree.
-IF(WIN32)
+IF(UNIX OR CYGWIN OR MINGW)
+        SET(CAI_INCLUDE_DIRS_BUILD_TREE
+                ${OTB_SOURCE_DIR}/Utilities/CAI
+                ${OTB_SOURCE_DIR}/Utilities/CAI/inc
+        )
+ELSE(UNIX OR CYGWIN OR MINGW)
         SET(CAI_INCLUDE_DIRS_BUILD_TREE 
                 ${OTB_SOURCE_DIR}/Utilities/CAI/cai_dll
                 ${OTB_SOURCE_DIR}/Utilities/CAI/cai_dll/inc
                 ${OTB_SOURCE_DIR}/Utilities/CAI/cai_dll/inc/inc_unix2win
         )
-ELSE(WIN32)
-        SET(CAI_INCLUDE_DIRS_BUILD_TREE
-                ${OTB_SOURCE_DIR}/Utilities/CAI
-                ${OTB_SOURCE_DIR}/Utilities/CAI/inc
-        )
-ENDIF(WIN32)
-
+ENDIF(UNIX OR CYGWIN OR MINGW)