include more selectively

CMakeLists.txt

@@ -1270,7 +1270,9 @@ endif(LINUX_JOYSTICK_H)
 if(MSVC)
   add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX
                   -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE)
-  set(GMSH_SRC ${GMSH_SRC};Fltk/Win32Icon.rc)
+  if(HAVE_FLTK)
+    set(GMSH_SRC ${GMSH_SRC};Fltk/Win32Icon.rc)
+  endif(HAVE_FLTK)
 endif(MSVC)
 
 if(WIN32 OR CYGWIN)

Common/OpenFile.cpp

@@ -20,7 +20,6 @@ typedef unsigned long intptr_t;
 #include "Context.h"
 #include "OpenFile.h"
 #include "CommandLine.h"
-#include "ReadImg.h"
 #include "OS.h"
 #include "StringUtils.h"
 #include "GeomMeshMatcher.h"
@@ -45,6 +44,10 @@ typedef unsigned long intptr_t;
 #include "PViewOptions.h"
 #endif
 
+#if defined(HAVE_GRAPHICS)
+#include "ReadImg.h"
+#endif
+
 #if defined(HAVE_FLTK)
 #include <FL/fl_ask.H>
 #include "FlGui.h"