From 6e199ed73469fe9f3f46157cf9b3aa67daa14b17 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Thu, 21 Aug 2008 09:22:39 +0000
Subject: [PATCH] - Make CGALimageIO compile at once (and not in two
 compilation units). - Add $URL$ and $Id$ at some places.

---
 CGALimageIO/src/CGALimageIO/CMakeLists.txt         | 12 +++++++-----
 CGALimageIO/src/CGALimageIO/Image_3.cpp            |  3 +++
 CGALimageIO/src/CGALimageIO/all_files.cpp          |  1 +
 Scripts/developer_scripts/autotest_cgal            |  4 ++--
 Scripts/developer_scripts/autotest_cgal_with_cmake |  4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CGALimageIO/src/CGALimageIO/CMakeLists.txt b/CGALimageIO/src/CGALimageIO/CMakeLists.txt
index b0569d52ca2..4855eb77db8 100644
--- a/CGALimageIO/src/CGALimageIO/CMakeLists.txt
+++ b/CGALimageIO/src/CGALimageIO/CMakeLists.txt
@@ -20,6 +20,7 @@
 assert(CGAL_BINARY_DIR)
 
 find_package(ZLIB)
+find_package(OpenGL)
 
 option(WITH_VTK "Add VTK support to the CGAL ImageIO library." OFF)
 
@@ -27,11 +28,12 @@ if(WITH_VTK)
   find_package(VTK QUIET)
 endif(WITH_VTK)
 
-if(ZLIB_FOUND)
+if(ZLIB_FOUND AND OPENGL_FOUND)
 
   include_directories( ${ZLIB_INCLUDE_DIR} )
+  include_directories( ${OPENGL_INCLUDE_DIR} )
   
-  add_library(CGAL_IMAGEIO all_files.cpp Image_3.cpp)
+  add_library(CGAL_IMAGEIO all_files.cpp)
 
   target_link_libraries( CGAL_IMAGEIO ${ZLIB_LIBRARY})
   
@@ -80,6 +82,6 @@ if(ZLIB_FOUND)
   if ( CGAL_INSTALL_LIB_DIR )
     install(TARGETS CGAL_IMAGEIO DESTINATION ${CGAL_INSTALL_LIB_DIR} )
   endif()
-else()
-  message( STATUS "CGAL-ImageIO needs ZLib, cannot be configured.")
-endif()  
+else(ZLIB_FOUND AND OPENGL_FOUND)
+  message( STATUS "CGAL-ImageIO needs ZLib and OpenGL, cannot be configured.")
+endif(ZLIB_FOUND AND OPENGL_FOUND)  
diff --git a/CGALimageIO/src/CGALimageIO/Image_3.cpp b/CGALimageIO/src/CGALimageIO/Image_3.cpp
index 9ed6346c008..c72e94b54b8 100644
--- a/CGALimageIO/src/CGALimageIO/Image_3.cpp
+++ b/CGALimageIO/src/CGALimageIO/Image_3.cpp
@@ -12,6 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
+// $URL$
+// $Id$
+//
 // Author(s)     : Laurent Rineau, Pierre Alliez
 
 #include <CGAL/Image_3.h>
diff --git a/CGALimageIO/src/CGALimageIO/all_files.cpp b/CGALimageIO/src/CGALimageIO/all_files.cpp
index 05d75cd0727..3424bc3cdbb 100644
--- a/CGALimageIO/src/CGALimageIO/all_files.cpp
+++ b/CGALimageIO/src/CGALimageIO/all_files.cpp
@@ -14,3 +14,4 @@
 #include "recbuffer.cpp"
 #include "recline.cpp"
 #include "reech4x4.cpp"
+#include "Image_3.cpp"
diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index 2059813d817..738f1d29280 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -18,8 +18,8 @@
 # ----------------------------------------------------
 # ----------------------------------------------------
 #
-# $URL $
-# $Id $
+# $URL$
+# $Id$
 
 #sets the umask to 022 & 0777
 umask 022
diff --git a/Scripts/developer_scripts/autotest_cgal_with_cmake b/Scripts/developer_scripts/autotest_cgal_with_cmake
index 02076a3b415..3d2e4819a3e 100755
--- a/Scripts/developer_scripts/autotest_cgal_with_cmake
+++ b/Scripts/developer_scripts/autotest_cgal_with_cmake
@@ -18,8 +18,8 @@
 # ----------------------------------------------------
 # ----------------------------------------------------
 #
-# URL $
-# $Id $
+# $URL: $
+# $Id: $
 
 #sets the umask to 022 & 0777
 umask 022