Correction pour portage Visual !

Utilities/otb6S/CMakeLists.txt

@@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES(${OTB6S_SOURCE_DIR})
 
 # Inform header files they are being included from a source inside the
 # otb_6S library.
-#ADD_DEFINITIONS(-DOTB_6S_SRC)
+ADD_DEFINITIONS(-DOTB_6S_SRC)
 
 # On Microsoft Visual
 IF(WIN32)
@@ -38,6 +38,10 @@ FILE(GLOB OTB6S_SRCS "6SV1.0B/*.c" )
 # Not use itkf2c because uncomplete for link 6S main exectuable
 FILE(GLOB LIBF2C_SRCS "libf2c/*.c" )
 
+#PB compil Visual: pb compatibilty with isatty function.
+LIST(REMOVE_ITEM LIBF2C_SRCS "${OTB6S_SOURCE_DIR}/libf2c/open.c" )
+LIST(REMOVE_ITEM LIBF2C_SRCS "${OTB6S_SOURCE_DIR}/libf2c/inquire.c" )
+
 
 INCLUDE_DIRECTORIES(${OTB6S_SOURCE_DIR}/libf2c)
 

Utilities/otb6S/otb_6S_f2c.h

@@ -3,6 +3,17 @@
 #ifndef otb_6S_f2c_h
 #define otb_6S_f2c_h
 
+/* Disable some warnings inside otb_6S sources.  */
+#ifdef OTB_6S_SRC
+# if defined(_MSC_VER)
+#  pragma warning (disable: 4244) /* conversion with possible loss of data */
+#  if !defined(_COMPLEX_DEFINED)
+    struct _complex { double x,y; };
+#   define _COMPLEX_DEFINED /* block math.h from defining complex macro */
+#  endif
+# endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -15,16 +26,6 @@ extern "C" {
 
 #if 0
 
-/* Disable some warnings inside otb_6S sources.  */
-#ifdef OTB_6S_SRC
-# if defined(_MSC_VER)
-#  pragma warning (disable: 4244) /* conversion with possible loss of data */
-#  if !defined(_COMPLEX_DEFINED)
-    struct _complex { double x,y; };
-#   define _COMPLEX_DEFINED /* block math.h from defining complex macro */
-#  endif
-# endif
-#endif
 
 /* Mangle the f2c symbols and types to have a otb_6S prefix.  */
 #include "otb_6S_f2c_mangle.h"