Merge to trunk commits from CGAL-3.5-branch so far.

Merged revisions 50855,50859,50863,50868,50871,50878-50879,50886,50893,50930-50934 via svnmerge from svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch ........ r50855 | lrineau | 2009-07-27 13:47:18 +0200 (Mon, 27 Jul 2009) | 1 line Attempt to fix links to precompiled demos. ........ r50859 | lrineau | 2009-07-27 14:37:54 +0200 (Mon, 27 Jul 2009) | 2 lines update the AUTHORS list ........ r50863 | lrineau | 2009-07-27 14:53:14 +0200 (Mon, 27 Jul 2009) | 3 lines Remove occurences of "3.4" in various files (problem reported by J. Reichel) ........ r50868 | lrineau | 2009-07-27 15:38:39 +0200 (Mon, 27 Jul 2009) | 2 lines Fix target names conflicts with Triangulation_2. ........ r50871 | lrineau | 2009-07-27 15:48:57 +0200 (Mon, 27 Jul 2009) | 2 lines Taucs will be updated for CGAL-3.5. ........ r50878 | lrineau | 2009-07-27 16:10:03 +0200 (Mon, 27 Jul 2009) | 2 lines There was still a 3.4 in that file. ........ r50879 | lrineau | 2009-07-27 16:16:11 +0200 (Mon, 27 Jul 2009) | 2 lines Fix a problem with \cgalrawversion{}: use "\cgalrawversion" instead! ........ r50886 | reichel | 2009-07-27 19:09:07 +0200 (Mon, 27 Jul 2009) | 2 lines Set CGAL_SONAME_VERSION to 4 and CGAL_SOVERSION to 4.0.0. ........ r50893 | lsaboret | 2009-07-28 10:27:31 +0200 (Tue, 28 Jul 2009) | 2 lines * Fixed include path. * Fixed order of libraries: TAUCS must be listed before LAPACK. ........ r50930 | lrineau | 2009-07-29 11:58:00 +0200 (Wed, 29 Jul 2009) | 2 lines Add periodic_3_demo to "make demos". ........ r50931 | lrineau | 2009-07-29 11:59:33 +0200 (Wed, 29 Jul 2009) | 2 lines Add CGAL ipelets to "make demos". ........ r50932 | lrineau | 2009-07-29 12:57:59 +0200 (Wed, 29 Jul 2009) | 2 lines Add the polyhedron demo to "make demos". ........ r50933 | lrineau | 2009-07-29 13:04:50 +0200 (Wed, 29 Jul 2009) | 2 lines Add the points set demo to "make demos". ........ r50934 | lrineau | 2009-07-29 13:09:22 +0200 (Wed, 29 Jul 2009) | 2 lines Make the windows installer fetch the manual from the right place! ........
2009-07-29 12:49:27 +00:00 · 2009-07-29 12:49:27 +00:00 · f1a3f94274
parent 47065c2ae1
commit f1a3f94274
16 changed files with 120 additions and 93 deletions
--- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
+++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
@ -35,6 +35,7 @@ if ( CGAL_FOUND )

    foreach(IPELET ${CGAL_IPELETS})
      add_library(CGAL_${IPELET} MODULE ${IPELET}.cpp)
+      add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_${IPELET})
      target_link_libraries( CGAL_${IPELET} ipe)
      if ( IPELET_INSTALL_DIR )
        install(TARGETS CGAL_${IPELET} DESTINATION ${IPELET_INSTALL_DIR})
--- a/Installation/AUTHORS
+++ b/Installation/AUTHORS
@ -7,8 +7,11 @@ Eric Berberich
 Olivier Billet
 Jean-Daniel Boissonnat
 Carine Bonetto
+Mario Botsch
 Hervé Brönnimann
 Fernando Cacciola
+Manuel Caroli
+Nicolas Carrez
 Frédéric Cazals
 Raphaëlle Chaine
 Tran Kai Frank Da
@ -29,6 +32,7 @@ Geert-Jan Giezeman
 Marc Glisse
 Shlomo Golubev
 Miguel Granados
+Gael Guennebaud
 Philippe Guigue
 Ankit Gupta
 Peter Hachenberger
@ -45,6 +49,7 @@ Dominik Huelse
 Marcel Janer
 Athanasios Kakargias
 Menelaos Karavelas
+Michael Kerber
 Lutz Kettner
 Nico Kruithof
 Eran Leiserowitz
@ -76,12 +81,14 @@ Laurent Rineau
 Daniel Russel
 Niv Sabath
 Laurent Saboret
+Nader Salman
 Stefan Schirra
 Sven Schönherr
 Michael Seel
 Ophir Setter
 Le-Jeng Shiue
 Hans Tangelder
+Stéphane Tayeb
 Monique Teillaud
 Jane Tournois
 Constantinos Tsirogiannis
@ -93,5 +100,6 @@ Wieger Wesselink
 Camille Wormser
 Mariette Yvinec
 Afra Zomorodian
+Guy Zucker
 Baruch Zukerman
 Tali Zvi
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@ -48,8 +48,8 @@ message( STATUS "CGAL_MAJOR_VERSION=${CGAL_MAJOR_VERSION}" )
 message( STATUS "CGAL_MINOR_VERSION=${CGAL_MINOR_VERSION}" )
 message( STATUS "CGAL_BUILD_VERSION=${CGAL_BUILD_VERSION}" )

-set( CGAL_SONAME_VERSION "${CGAL_MAJOR_VERSION}"     CACHE STRING "soname-version" )
-set( CGAL_SOVERSION      "${CGAL_MAJOR_VERSION}.0.0" CACHE STRING "soversion" )
+set( CGAL_SONAME_VERSION "4"     CACHE STRING "soname-version" )
+set( CGAL_SOVERSION      "4.0.0" CACHE STRING "soversion" )

 mark_as_advanced(CGAL_SONAME_VERSION)
 mark_as_advanced(CGAL_SOVERSION)
--- a/Installation/INSTALL
+++ b/Installation/INSTALL
@ -11,7 +11,7 @@ are for the most common use cases, and cover the command line tools.
 For further information, or in case of problems, please see the
 detailed installation instructions, which can be found in this
 distribution in the file ./doc_html/index.html or on the CGAL website
-http://www.cgal.org/Manual/3.4/doc_html/installation_manual/contents.html
+http://www.cgal.org/Manual/last/doc_html/installation_manual/contents.html

 The documentation of CGAL is available in PDF and HTML formats.
 It is not bundled with the software but can be downloaded separately
@ -49,13 +49,13 @@ CGAL packages, some are only needed for demos.

     - GMP (>= 4.1.4)
       http://gmplib.org/
-       or precompiled version that can be downloaded with CGAL-3.4-Setup.exe
+       or precompiled version that can be downloaded with CGAL-3.5-Setup.exe
       based on http://fp.gladman.plus.com/computing/gmp4win.htm


     - MPFR (>= 2.2.1)
       http://www.mpfr.org/
-       or precompiled version that can be downloaded with CGAL-3.4-Setup.exe
+       or precompiled version that can be downloaded with CGAL-3.5-Setup.exe
       based on http://fp.gladman.plus.com/computing/gmp4win.htm

     - LEDA (>= 6.0)
@ -85,13 +85,13 @@ CGAL packages, some are only needed for demos.
       o Approximation of Ridges and Umbilics
       o Planar Parameterization of Triangulated Surface Meshes
       http://www.netlib.org/blas/, http://www.netlib.org/lapack/
-       or precompiled version that can be downloaded with CGAL-3.4-Setup.exe
+       or precompiled version that can be downloaded with CGAL-3.5-Setup.exe

     - TAUCS (sparse matrix solver)
       Accelerates the package:
       o Planar Parameterization of Triangulated Surface Meshes
       http://www.tau.ac.il/~stoledo/taucs/
-       or precompiled version that can be downloaded with CGAL-3.4-Setup.exe
+       or precompiled version that can be downloaded with CGAL-3.5-Setup.exe

   * Miscellaneous

--- a/Installation/auxiliary/cgal_create_cmake_script.1
+++ b/Installation/auxiliary/cgal_create_cmake_script.1
@ -1,4 +1,4 @@
-.TH CGAL_CREATE_CMAKE_SCRIPT "1" "December 2008" "CGAL 3.4" "User Commands"
+.TH CGAL_CREATE_CMAKE_SCRIPT "1" "July 2009" "CGAL 3.5" "User Commands"
 .SH NAME
 cgal_create_cmake_script \- create a cmake script for applications using CGAL
 .SH SYNOPSIS
--- a/Installation/doc_tex/Installation/appendix.tex
+++ b/Installation/doc_tex/Installation/appendix.tex
@ -24,7 +24,7 @@ For each compiler a file \texttt{<CGAL/compiler\_config.h>}
 settings of all flags. This file is generated automatically by 
 \cmake, and it is located in the \texttt{include} directory of
 where you run \cmake. For an in-source configuration this means
-\texttt{CGAL-3.4/include}.
+\texttt{CGAL-3.x/include}.

 The test programs used to generate the \texttt{compiler\_config.h}
 file can be found in \texttt{config/testfiles}.
--- a/Installation/doc_tex/Installation/installation.tex
+++ b/Installation/doc_tex/Installation/installation.tex
@ -40,7 +40,7 @@
 \newcommand{\mswin}{\textsc{MS}~Windows}

 %% macro for CGAL release number
-\newcommand{\cgalrelease}{3.4}
+\newcommand{\cgalrelease}{3.5}

 %% macro for CGAL directory
 \newcommand{\cgaldir}{\texttt{CGAL-\cgalrelease}}
@ -89,11 +89,11 @@ This document describes how to install \cgal\ on Windows, Unix-like systems and
 Ideally, installing \cgal amounts to:

 \begin{verbatim}
-  cd  CGAL-3.4                                # go to CGAL directory
+  cd  CGAL-3.5                                # go to CGAL directory
  cmake .                                     # configure CGAL
  make                                        # build the CGAL libraries
  cd examples/Straight_skeleton_2             # go to an example directory
-  cmake -DCGAL_DIR=$HOME/CGAL-3.4 .           # configure the examples
+  cmake -DCGAL_DIR=$HOME/CGAL-3.5 .           # configure the examples
  make                                        # build the examples 
 \end{verbatim}
 %%   $   This dollar is there to trick syntax highlighting in emacs 
@ -110,7 +110,7 @@ e.g. for numeric solvers, or visualization.
 \subsection{Compilers}

 In order to build the \cgal\ libraries, you need a \CC\ compiler.  
-\cgal~3.4 is supported for the following compilers/operating systems:
+\cgal~3.5 is supported for the following compilers/operating systems:

 \begin{center}\index{compilers!supported}\index{supported compilers}
  \renewcommand{\arraystretch}{1.3}
@ -202,16 +202,16 @@ supported by the \taucs\ project, we provide a precompiled version of

 The \cgal\ library can be downloaded from  \path'http://www.cgal.org/download.html'.

-After you have downloaded the file \texttt{CGAL-3.4.tar.gz} containing the
+After you have downloaded the file \texttt{CGAL-3.5.tar.gz} containing the
 \cgal\ sources, you have to unpack it. Under a Unix-like shell, use the
 command:

 \begin{verbatim}
-      tar xzf CGAL-3.4.tar.gz
+      tar xzf CGAL-3.5.tar.gz
 \end{verbatim}


-When you are on Windows you may download and run the \texttt{CGAL-3.4-Setup.exe}. It is a
+When you are on Windows you may download and run the \texttt{CGAL-3.5-Setup.exe}. It is a
 self extracting executable that installs the \cgal\ source, and that allows
 you to select and download some precompiled third party libraries.

@ -257,7 +257,7 @@ third-party libraries you want to use and where they can be found, and
 which \cgal\ libraries you want to build. Gathering
 all this information is called {\em configuration}. 

-For CGAL-3.4, the configuration is generated with \cmake, a
+For CGAL-3.5, the configuration is generated with \cmake, a
 cross-platform build system.  This manual explains only those features of
 \cmake\ which are needed in order to build \cgal. Please refer to the \cmake\ 
 documentation at \cmakepage\ for further details.
@ -274,7 +274,7 @@ argument the root directory of \cgal. For example:

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-  cd  CGAL-3.4
+  cd  CGAL-3.5
  cmake-gui . # Notice the dot to indicate the current directory.
 \end{verbatim}
 }
@ -302,7 +302,7 @@ Alternatively, you can run the command-line tool called

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-  cd  CGAL-3.4
+  cd  CGAL-3.5
  cmake . # Notice the dot to indicate the current directory.
 \end{verbatim}
 }
@ -334,7 +334,7 @@ build files). For example, the following generates solution files for use in Vis

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-  cd CGAL-3.4
+  cd CGAL-3.5
  cmake -G"Visual Studio 9 2008" . 
 \end{verbatim}
 }
@ -346,7 +346,7 @@ specify the desired compiler in the call to \cmake{}, as in this example:

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-  cd CGAL-3.4
+  cd CGAL-3.5
  cmake -DCMAKE_CXX_COMPILER:FILEPATH=g++-3.4 . 
 \end{verbatim}
 }
@ -401,7 +401,7 @@ If you turn off the configuration of a library, you can still configure it manua

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-  cd CGAL-3.4/src/CGALQt4 
+  cd CGAL-3.5/src/CGALQt4 
  cmake . # configures only the CGAL_Qt4 library
 \end{verbatim}
 }
@ -454,12 +454,12 @@ You can, for example, generate subdirectories \cgaldir{}\texttt{/cmake/platforms

 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}
-mkdir CGAL-3.4/cmake/platforms/debug
-cd CGAL-3.4/cmake/platforms/debug
+mkdir CGAL-3.5/cmake/platforms/debug
+cd CGAL-3.5/cmake/platforms/debug
 cmake -DCMAKE_BUILD_TYPE=Debug ../../..

-mkdir CGAL-3.4/cmake/platforms/release
-cd CGAL-3.4/cmake/platforms/release
+mkdir CGAL-3.5/cmake/platforms/release
+cd CGAL-3.5/cmake/platforms/release
 cmake -DCMAKE_BUILD_TYPE=Release ../../..
 \end{verbatim}
 }
@ -480,7 +480,7 @@ succeeding build step as follows:
 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}

-cd CGAL-3.4
+cd CGAL-3.5

 # build all the selected libraries at once

@ -578,7 +578,7 @@ installation in a {\sc Unix}-like environment:
 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}

-cd CGAL-3.4
+cd CGAL-3.5

 cmake .      # configure
 make         # compile
@ -600,7 +600,7 @@ variable explicitly {\em at the configuration time} and not when executing the i
 \end{ccAdvanced}

 The file \texttt{CGALCOnfig.cmake} is installed by default in
-\texttt{\$CMAKE\_INSTALLED\_PREFIX/lib/CGAL-3.4}.
+\texttt{\$CMAKE\_INSTALLED\_PREFIX/lib/CGAL-3.5}.


 \section{Configuring and Building Programs Using \cgal}
@ -619,8 +619,8 @@ to indicate the location of that config file in the \cmake\ variable
 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}

-cd CGAL-3.4/examples/Straight_skeleton_2
-cmake -DCGAL_DIR=$HOME/CGAL-3.4 .
+cd CGAL-3.5/examples/Straight_skeleton_2
+cmake -DCGAL_DIR=$HOME/CGAL-3.5 .
 make

 \end{verbatim}
@ -660,13 +660,13 @@ controlling variable right up front:
 {\ccTexHtml{\scriptsize}{}
 \begin{verbatim}

-cd CGAL-3.4
+cd CGAL-3.5

 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-g .

-cd CGAL-3.4/examples/Straight_skeleton_2
+cd CGAL-3.5/examples/Straight_skeleton_2

-cmake -DCGAL_DIR=CGAL-3.4 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=-O2 -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS=TRUE . 
+cmake -DCGAL_DIR=CGAL-3.5 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=-O2 -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS=TRUE . 

 \end{verbatim}
 }
@ -1119,7 +1119,7 @@ cmake -DWITH_examples=false
 -- uic executable:     C:/Work/Downloaded/Libraries/qt-win-opensource-src-4.4.1/bin/uic.exe
 -- Configuring done
 -- Generating done
-- Build files have been written to: C:/Work/Active/GeometryFactory/CGAL/Autotest/CGAL-3.4-I-442/cmake/platforms/a
+-- Build files have been written to: C:/Work/Active/GeometryFactory/CGAL/Autotest/CGAL-3.5/cmake/platforms/a
 \end{verbatim}
 }

--- a/Manual/doc_html/index.html
+++ b/Manual/doc_html/index.html
@ -32,7 +32,7 @@ in the form of a C++ library.
 <li><a href ="installation_manual/contents.html">CGAL Installation Guide</a>
 <li><a href ="cgal_manual/contents.html">CGAL Manual - Table of Contents</a>
 <li><a href ="cgal_manual/packages.html">CGAL Manual - Package Overview</a>
-<li><a href ="http://www.cgal.org/Manual/3.4/doc_html/cgal_manual/contents.html">CGAL Online Manual</a>
+<li><a href ="http://www.cgal.org/Manual/last/doc_html/cgal_manual/contents.html">CGAL Online Manual</a>
 </ul>
 </p>

--- a/Manual/doc_tex/Manual/cgal_manual.sty
+++ b/Manual/doc_tex/Manual/cgal_manual.sty
@ -42,6 +42,7 @@
  \ifx\cgalversion\@ClearUndefdMacro
    \gdef\cgalversion{Separate Build}
  \else
+    \xdef\cgalrawversion{\cgalversion}
    \xdef\cgalversion{Release \cgalversion}
  \fi
  \ifx\cgalinternalversion\@ClearUndefdMacro
@ -56,6 +57,7 @@
  \lciIfFileExists{version.tex}{\input{version.tex}}{}%
  \lciIfDefined{\cgalversion}%
    {\xdef\cgalTmpVersion{\cgalversion}%
+     \xdef\cgalrawversion{\cgalversion}
     \gdef\cgalversion{Release \cgalTmpVersion}}%
    {\gdef\cgalversion{Separate Build}}%
  \lciIfDefined{\cgalinternalversion}%
--- a/Manual_tools/src/latex_converter_config/html/cc_manual.sty
+++ b/Manual_tools/src/latex_converter_config/html/cc_manual.sty
@ -1091,7 +1091,7 @@
 %\newcommand{\ccPkgDemo}[2]{\lciPushGlobalStack{\ccValueofPkgDemo}{#1}}
 \newcommand{\ccPkgDemo}[2]{\ccPkgDemoX{#1}{#2}{\ccValueofPkgDemo}}
 \newcommand{\ccPkgDemoX}[3]{\gdef\ccValueofPkgDemo{%
-#Y3\lcRawHtml{<b>Demo: </b><a href="http://www.cgal.org/demo/}\lcRawHtmlExpanded{\cgalversion{}/#2}\lcRawHtml{">}#1\lcRawHtml{</a><br>}}%
+#Y3\lcRawHtml{<b>Demo: </b><a href="http://www.cgal.org/demo/}\lcRawHtmlExpanded{\cgalrawversion/#2}\lcRawHtml{">}#1\lcRawHtml{</a><br>}}%
 }

 \newenvironment{ccPkgDescription}{\ccPkgDescriptionX}{\end{savestream}}
--- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
+++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
@ -57,6 +57,8 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND)
  		    MainWindow.ui moc_MainWindow.cpp 
 		    ${UI_FILES} ${RESOURCE_FILES})

+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS periodic_3_triangulation_3_demo)
+
  # Link the executable to CGAL and third-party libraries
  target_link_libraries(periodic_3_triangulation_3_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )

--- a/Periodic_3_triangulation_3/doc_tex/Periodic_3_triangulation_3/P3Triang3.tex
+++ b/Periodic_3_triangulation_3/doc_tex/Periodic_3_triangulation_3/P3Triang3.tex
@ -329,7 +329,7 @@ If the user needs to add a type in a vertex that depends on the
 \ccc{Cell_handle}), then he has to derive his own vertex base class,
 as the following example shows.

-\ccIncludeExampleCode{Periodic_3_triangulation_3/adding_handles.cpp}
+\ccIncludeExampleCode{Periodic_3_triangulation_3/periodic_adding_handles.cpp}

 \subsection{27-sheeted Covering}
 The user can check at any time whether a triangulation would be a
--- a/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/periodic_adding_handles.cpp
+++ b/Periodic_3_triangulation_3/examples/Periodic_3_triangulation_3/periodic_adding_handles.cpp
--- a/Polyhedron/demo/Polyhedron/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt
@ -24,7 +24,7 @@ foreach(DEP_PKG AABB_tree STL_Extension GraphicsView Surface_mesher Filtered_ker
 endforeach()

 # Include this package's headers first
-include_directories( BEFORE ./ ./include ../../../include )
+include_directories( BEFORE ./ ./include ../../include )

 # Find CGAL and CGAL Qt4
 find_package(CGAL COMPONENTS Qt4)
@ -56,13 +56,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)

  include_directories ( ${QGLVIEWER_INCLUDE_DIR} )

-  if(LAPACK_FOUND)
-    include( ${LAPACK_USE_FILE} )
-    add_definitions(-DCGAL_LAPACK_ENABLED)
-  else(LAPACK_FOUND)
-    message(STATUS "warning: LAPACK is not found. curvatures estimation will not be available.")
-  endif(LAPACK_FOUND)
-
+  # Link with BLAS, LAPACK and TAUCS (optional)
  if(TAUCS_FOUND)
    include( ${TAUCS_USE_FILE} )
    add_definitions(-DCGAL_TAUCS_ENABLED)
@ -70,6 +64,14 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
    message(STATUS "warning: TAUCS is not found. parametrization will not be available.")
  endif(TAUCS_FOUND)

+  # Link with BLAS and LAPACK only (optional)
+  if(LAPACK_FOUND)
+    include( ${LAPACK_USE_FILE} )
+    add_definitions(-DCGAL_LAPACK_ENABLED)
+  else(LAPACK_FOUND)
+    message(STATUS "warning: LAPACK is not found. curvatures estimation will not be available.")
+  endif(LAPACK_FOUND)
+
  qt4_wrap_ui( UI_FILES MainWindow.ui )

  include(AddFileDependencies)
@ -114,6 +116,10 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
    Scene_nef_rendering.cpp)
  target_link_libraries(scene_nef_polyhedron_item scene_polyhedron_item)

+  foreach( lib scene_item scene_basic_objects scene_polyhedron_item polygon_soup scene_nef_polyhedron_item )
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${lib} )
+  endforeach()
+
  add_definitions(-DQT_STATICPLUGIN)
 #  if(POLYHEDRON_DEMO_ENABLE_FORWARD_DECL)
    add_definitions(-DUSE_FORWARD_DECL)
@ -128,6 +134,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
      Viewer_moc.cpp
      texture.cpp
      ${UI_FILES} ${RESOURCE_FILES} )
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polyhedron_3 )
    if(TAUCS_FOUND)
 #      add_executable( Polyhedron_3 Scene_tex_rendering.cpp Scene_tex_polyhedron_operations.cpp )
    endif()
@ -171,6 +178,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
    add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )

    add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${plugin_name} )
    # Link with Qt
    target_link_libraries( ${plugin_name} ${QT_LIBRARIES} )
    # Link with scene_item
--- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
+++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
@ -162,6 +162,10 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
    Point_set_scene_item.cpp Point_set_scene_item.moc)
  target_link_libraries(point_set PS_demo_scene_item)

+  foreach(lib PS_demo_scene_item PS_demo_scene_basic_objects PS_demo_scene_polyhedron_item point_set)
+    add_to_cached_list(CGAL_EXECUTABLE_TARGETS ${lib})
+  endforeach()
+
  if(GLEW_FOUND)
    target_link_libraries( point_set gl_splat ${GLEW_LIBRARIES} )
  endif(GLEW_FOUND)
@ -180,6 +184,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
      Scene_moc.cpp
      Viewer_moc.cpp
      ${RESOURCE_FILES} )
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS Point_set_demo )
 #  else(POINT_SET_DEMO_ENABLE_FORWARD_DECL)
 #    add_file_dependencies( Point_set_demo.cpp "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp"
 #                                            "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp"
@ -224,6 +229,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
    add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )

    add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${plugin_name} )
    # Link with Qt
    target_link_libraries( ${plugin_name} ${QT_LIBRARIES} )
    # Link with scene_item
--- a/wininst/developer_scripts/script_cgal_3_5.nsi
+++ b/wininst/developer_scripts/script_cgal_3_5.nsi
@ -219,55 +219,55 @@ ${MultiVariantSection} "GMP and MPFR precompiled libs"  Install_GMP_MPFR_bin "$P
 ;--------------------------------
 Section /o "LAPACK and TAUCS precompiled libs" TAUCS_LIB_Idx

-  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.4/"  "taucs.h.zip"               "$INSTDIR\auxiliary\taucs\include"
-  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.4/"  "taucs_private.h.zip"       "$INSTDIR\auxiliary\taucs\include"
-  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.4/"  "taucs_config_tests.h.zip"  "$INSTDIR\auxiliary\taucs\include"
-  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.4/"  "taucs_config_build.h.zip"  "$INSTDIR\auxiliary\taucs\include"
-  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.4/"  "blaswrap.h.zip"            "$INSTDIR\auxiliary\taucs\include"
+  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.5/"  "taucs.h.zip"               "$INSTDIR\auxiliary\taucs\include"
+  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.5/"  "taucs_private.h.zip"       "$INSTDIR\auxiliary\taucs\include"
+  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.5/"  "taucs_config_tests.h.zip"  "$INSTDIR\auxiliary\taucs\include"
+  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.5/"  "taucs_config_build.h.zip"  "$INSTDIR\auxiliary\taucs\include"
+  !insertmacro DownloadFile "auxiliary/$Platform/TAUCS-CGAL-3.5/"  "blaswrap.h.zip"            "$INSTDIR\auxiliary\taucs\include"

  ${If} "$Platform" == "win32"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libatlas.lib.zip"             "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libcblas.lib.zip"             "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libf77blas.lib.zip"           "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "liblapack.lib.zip"            "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtstatlas.lib.zip"          "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libmetis-vc71-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libmetis-vc71-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libmetis-vc71-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libmetis-vc71-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt-sgd.pdb.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "libtaucs-vc71-mt-gd.pdb.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "vcf2c-vc71-mt-s.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "vcf2c-vc71-mt.lib.zip"        "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "vcf2c-vc71-mt-sgd.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.4/" "vcf2c-vc71-mt-gd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libatlas.lib.zip"             "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libcblas.lib.zip"             "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libf77blas.lib.zip"           "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "liblapack.lib.zip"            "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtstatlas.lib.zip"          "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libmetis-vc71-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libmetis-vc71-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libmetis-vc71-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libmetis-vc71-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt-sgd.pdb.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "libtaucs-vc71-mt-gd.pdb.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "vcf2c-vc71-mt-s.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "vcf2c-vc71-mt.lib.zip"        "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "vcf2c-vc71-mt-sgd.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/win32/TAUCS-CGAL-3.5/" "vcf2c-vc71-mt-gd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
  ${Else}
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libmetis-vc80-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libmetis-vc80-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libmetis-vc80-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libmetis-vc80-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt-sgd.pdb.zip" "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "libtaucs-vc80-mt-gd.pdb.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "vcf2c-vc80-mt-s.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "vcf2c-vc80-mt.lib.zip"        "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "vcf2c-vc80-mt-sgd.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "vcf2c-vc80-mt-gd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "clapack-vc80-mt-s.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "clapack-vc80-mt.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "clapack-vc80-mt-sgd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "clapack-vc80-mt-gd.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "blas-vc80-mt-s.lib.zip"       "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "blas-vc80-mt.lib.zip"         "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "blas-vc80-mt-sgd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
-  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.4/" "blas-vc80-mt-gd.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libmetis-vc80-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libmetis-vc80-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libmetis-vc80-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libmetis-vc80-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt-s.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt-sgd.lib.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt-sgd.pdb.zip" "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt-gd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "libtaucs-vc80-mt-gd.pdb.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "vcf2c-vc80-mt-s.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "vcf2c-vc80-mt.lib.zip"        "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "vcf2c-vc80-mt-sgd.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "vcf2c-vc80-mt-gd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "clapack-vc80-mt-s.lib.zip"    "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "clapack-vc80-mt.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "clapack-vc80-mt-sgd.lib.zip"  "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "clapack-vc80-mt-gd.lib.zip"   "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "blas-vc80-mt-s.lib.zip"       "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "blas-vc80-mt.lib.zip"         "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "blas-vc80-mt-sgd.lib.zip"     "$INSTDIR\auxiliary\taucs\lib"
+  	!insertmacro DownloadFile "auxiliary/x64/TAUCS-CGAL-3.5/" "blas-vc80-mt-gd.lib.zip"      "$INSTDIR\auxiliary\taucs\lib"
  ${Endif}

 SectionEnd
@ -275,7 +275,7 @@ SectionEnd

 Section /o "HTML Manuals" DOC_Idx
  !ifndef FetchLocal
-    !insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/3.4/Manual/" "cgal_manual.zip"  "$INSTDIR\doc_html"
+    !insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/3.5/Manual/" "cgal_manual.zip"  "$INSTDIR\doc_html"
  !endif  
 SectionEnd