- Make CGALimageIO compile at once (and not in two compilation units).

- Add $URL$ and $Id$ at some places.

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()
+else(ZLIB_FOUND AND OPENGL_FOUND)
-  message( STATUS "CGAL-ImageIO needs ZLib, cannot be configured.")
+  message( STATUS "CGAL-ImageIO needs ZLib and OpenGL, cannot be configured.")
-endif()  
+endif(ZLIB_FOUND AND OPENGL_FOUND)  

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>

CGALimageIO/src/CGALimageIO/all_files.cpp

@@ -14,3 +14,4 @@
 #include "recbuffer.cpp"
 #include "recline.cpp"
 #include "reech4x4.cpp"
+#include "Image_3.cpp"

Scripts/developer_scripts/autotest_cgal

@@ -18,8 +18,8 @@
 # ----------------------------------------------------
 # ----------------------------------------------------
 #
-# $URL $
+# $URL$
-# $Id $
+# $Id$
 
 #sets the umask to 022 & 0777
 umask 022

Scripts/developer_scripts/autotest_cgal_with_cmake

@@ -18,8 +18,8 @@
 # ----------------------------------------------------
 # ----------------------------------------------------
 #
-# URL $
+# $URL: $
-# $Id $
+# $Id: $
 
 #sets the umask to 022 & 0777
 umask 022