diff --git a/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp b/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp
index cb83e2415d8..f8e2428d1c1 100644
--- a/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp
+++ b/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp
@@ -12,12 +12,12 @@
 
 #include <CGAL/basic.h>
 
-#ifdef  _MSC_VER
+#if defined  _MSC_VER || not defined CGAL_USE_GEOMVIEW
 
 #include <iostream>
 
 int main() {
-  std::cout << "Geomview doesn't work on Windows, so no demo." << std::endl;
+  std::cout << "We don't support Geomview anymore, so no demo." << std::endl;
   return 0;
 }
 #else // can have Geomeview