From f009eec17a35a3a82a4c49394f47a10a14f24956 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Mon, 29 May 2006 08:36:19 +0000
Subject: [PATCH] MAJ Config CAI
---
Utilities/CAI/CMakeLists.txt | 9 +++++----
Utilities/CAI/caiIncludeDirectories.cmake | 16 +++++++---------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Utilities/CAI/CMakeLists.txt b/Utilities/CAI/CMakeLists.txt
index 67c9d93e9c..f53bbb202f 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 b17e8cec58..464daafd08 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)
--
GitLab