From 940be95c0a60aec2c4db7224e1f267cf2b219272 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 16 Feb 2012 17:13:07 +0000 Subject: [PATCH 001/102] Credit sloccount --- Installation/changes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/changes.html b/Installation/changes.html index 91e7703684b..443011d4d66 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -90,7 +90,7 @@
Number of lines of code of CGAL
-(restricted to the include/CGAL/ and src/ directories). +(using David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/ and src/ directories).
Releases size graph
From 49036ad9cfe3822623cd402d0c1c76bfa7942e8e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 21 Feb 2012 09:46:06 +0000 Subject: [PATCH 002/102] Remove a problematic test that consumes too much CPU each night Quote of a mail on mines: " We have problems with the testsuite of CGAL::Polytope_distance_d. The test test/Polytope_distance_d/test_Polytope_distance_d_d.cpp frequently enters an (seemly) infinite loop consuming CPU, in the testsuite, and is killed after our hour. On a given platform, the issue seems frequent but not fully reproducible. Last night, that single test consumed 5 hours of CPU on my Linux test machine, and 2 hours on the Windows test machine, just to fail. " --- Polytope_distance_d/dont_submit | 1 + 1 file changed, 1 insertion(+) diff --git a/Polytope_distance_d/dont_submit b/Polytope_distance_d/dont_submit index 495c8d546a2..704914bc87f 100644 --- a/Polytope_distance_d/dont_submit +++ b/Polytope_distance_d/dont_submit @@ -1,2 +1,3 @@ Makefile* web +test/Polytope_distance_d/test_Polytope_distance_d_d.cpp From be1eeb9341e3d4f23f8eed53074f444018679a48 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 21 Feb 2012 10:18:33 +0000 Subject: [PATCH 003/102] Save my files used to compile Boost into SVN --- .gitattributes | 2 + .../boost/compile-boost | 5 + .../boost/user-config.jam | 98 +++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost create mode 100644 Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam diff --git a/.gitattributes b/.gitattributes index 38dfe03cf13..0f615b345b2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2161,6 +2161,8 @@ Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_ Maintenance/infrastructure/delaunay.geometryfactory.com/scripts/compile-boost-i686 -text Maintenance/infrastructure/delaunay.geometryfactory.com/scripts/compile-boost-x64 -text Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc -text +Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost -text +Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam -text Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/setup-common -text Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup -text Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup -text diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost new file mode 100644 index 00000000000..43f88f217cc --- /dev/null +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost @@ -0,0 +1,5 @@ +./bjam toolset=gcc-4.6.2 +./bjam toolset=gcc-cxxdebug --stagedir=stage-cxxdebug + +source ~/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup +./bjam toolset=intel --stagedir=stage-intel diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam new file mode 100644 index 00000000000..3462424b5f1 --- /dev/null +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam @@ -0,0 +1,98 @@ +# Copyright 2003, 2005 Douglas Gregor +# Copyright 2004 John Maddock +# Copyright 2002, 2003, 2004, 2007 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + +# This file is used to configure your Boost.Build installation. You can modify +# this file in place, or you can place it in a permanent location so that it +# does not get overwritten should you get a new version of Boost.Build. See: +# +# http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html +# +# for documentation about possible permanent locations. + +# This file specifies which toolsets (C++ compilers), libraries, and other +# tools are available. Often, you should be able to just uncomment existing +# example lines and adjust them to taste. The complete list of supported tools, +# and configuration instructions can be found at: +# +# http://boost.org/boost-build2/doc/html/bbv2/reference/tools.html +# + +# This file uses Jam language syntax to describe available tools. Mostly, +# there are 'using' lines, that contain the name of the used tools, and +# parameters to pass to those tools -- where paremeters are separated by +# semicolons. Important syntax notes: +# +# - Both ':' and ';' must be separated from other tokens by whitespace +# - The '\' symbol is a quote character, so when specifying Windows paths you +# should use '/' or '\\' instead. +# +# More details about the syntax can be found at: +# +# http://boost.org/boost-build2/doc/html/bbv2/advanced.html#bbv2.advanced.jam_language +# + +# ------------------ +# GCC configuration. +# ------------------ + +# Configure gcc (default version). +# using gcc ; + +# Configure specific gcc version, giving alternative name to use. +# using gcc : 3.2 : g++-3.2 ; + + +# ------------------- +# MSVC configuration. +# ------------------- + +# Configure msvc (default version, searched for in standard locations and PATH). +# using msvc ; + +# Configure specific msvc version (searched for in standard locations and PATH). +# using msvc : 8.0 ; + + +# ---------------------- +# Borland configuration. +# ---------------------- +# using borland ; + + +# ---------------------- +# STLPort configuration. +# ---------------------- + +# Configure specifying location of STLPort headers. Libraries must be either +# not needed or available to the compiler by default. +# using stlport : : /usr/include/stlport ; + +# Configure specifying location of both headers and libraries explicitly. +# using stlport : : /usr/include/stlport /usr/lib ; + + +# ----------------- +# QT configuration. +# ----------------- + +# Configure assuming QTDIR gives the installation prefix. +# using qt ; + +# Configure with an explicit installation prefix. +# using qt : /usr/opt/qt ; + +# --------------------- +# Python configuration. +# --------------------- + +# Configure specific Python version. +# using python : 3.1 : /usr/bin/python3 : /usr/include/python3.1 : /usr/lib ; + +using gcc + : cxxdebug + : "/usr/lib64/ccache/g++" # your path to the C++0x compiler + : -D_GLIBCXX_DEBUG + ; From 44e9d9666bc4c1ea9377dacc1e2690d86bf309eb Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 21 Feb 2012 13:04:11 +0000 Subject: [PATCH 004/102] Update the command line to built Boost with Intel compiler --- .../renoir.geometryfactory.com/boost/compile-boost | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost index 43f88f217cc..07f4ef4fa3b 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost @@ -2,4 +2,5 @@ ./bjam toolset=gcc-cxxdebug --stagedir=stage-cxxdebug source ~/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup -./bjam toolset=intel --stagedir=stage-intel +./bjam toolset=intel --stagedir=stage-intel cxxflags="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8" + From e534c42e1cd17e1b24639ed71c5bd5e9a68829a7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 24 Feb 2012 12:24:01 +0000 Subject: [PATCH 005/102] Fix the detection of qcollectiongenerator --- .../demo/Periodic_Lloyd_3/CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt index e542cf066f3..2f6e154aca9 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt @@ -28,11 +28,7 @@ if(QT4_FOUND) find_package(QGLViewer) endif(QT4_FOUND) -if (NOT ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} STREQUAL "QT_QCOLLECTIONGENERATOR_EXECUTABLE-NOTFOUND") - set(QCOLLECTIONGENERATOR_FOUND) -endif() - -if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QCOLLECTIONGENERATOR_FOUND ) +if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE ) include(${QT_USE_FILE}) @@ -69,7 +65,7 @@ if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QCOLLECTI target_link_libraries( Periodic_Lloyd_3 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ) target_link_libraries( Periodic_Lloyd_3 ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -else( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QCOLLECTIONGENERATOR_FOUND ) +else( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE ) set(PERIODIC_LLOYD_MISSING_DEPS "") @@ -89,11 +85,11 @@ else( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QCOLLECT set(PERIODIC_LLOYD_MISSING_DEPS "QGLViewer, ${PERIODIC_LLOYD_MISSING_DEPS}") endif() - if(NOT QCOLLECTIONGENERATOR_FOUND) + if(NOT QT_QCOLLECTIONGENERATOR_EXECUTABLE) set(PERIODIC_LLOYD_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_LLOYD_MISSING_DEPS}") - endif() + endif() message(STATUS "NOTICE: This demo requires ${PERIODIC_LLOYD_MISSING_DEPS}and will not be compiled.") -endif( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QCOLLECTIONGENERATOR_FOUND ) +endif( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE ) From db0edfe7b1fcb618d6742efc5e5e6b1a5b69eaa2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 24 Feb 2012 15:27:32 +0000 Subject: [PATCH 006/102] Add a href to sloccount --- Installation/changes.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Installation/changes.html b/Installation/changes.html index 443011d4d66..2155232a57c 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -90,7 +90,8 @@
Number of lines of code of CGAL
-(using David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/ and src/ directories). +(using +David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/ and src/ directories).
Releases size graph
From 3ac8f48575c167f322031545d673c83335710168 Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Fri, 24 Feb 2012 17:45:38 +0000 Subject: [PATCH 007/102] Add license notes for Boost files as discussed with Laurent. --- .gitattributes | 1 + Installation/LICENSE | 7 +++++++ Installation/LICENSE.BSL | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 Installation/LICENSE.BSL diff --git a/.gitattributes b/.gitattributes index 0f615b345b2..0b9f6e1dd28 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1707,6 +1707,7 @@ HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.gif -text svneol=unset#image/ HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.pdf -text svneol=unset#application/pdf HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional_small.gif -text svneol=unset#image/gif Installation/INSTALL -text +Installation/LICENSE.BSL -text Installation/LICENSE.FREE_USE -text Installation/LICENSE.GPL -text Installation/VERSION -text diff --git a/Installation/LICENSE b/Installation/LICENSE index 342c1dead52..948be6d1391 100644 --- a/Installation/LICENSE +++ b/Installation/LICENSE @@ -15,6 +15,13 @@ Foundation; either version 3 of the License or (at your option) any later version). The texts of both licenses can be found in the files LICENSE.GPL and LICENSE.LGPL. +The following files are modified versions taken from Boost and are licensed +under the Boost Software License (see LICENSE.BSL). +- include/CGAL/auto_link/auto_link.h +- include/CGAL/internal/container_fwd_fixed.hpp +- include/CGAL/internal/boost/array_binary_tree.hpp +- include/CGAL/internal/boost/mutable_heap.hpp +- include/CGAL/internal/boost/mutable_queue.hpp Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own diff --git a/Installation/LICENSE.BSL b/Installation/LICENSE.BSL new file mode 100644 index 00000000000..36b7cd93cdf --- /dev/null +++ b/Installation/LICENSE.BSL @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. From 190d15826d03f9582bbf34b9bca51c2c06ecf04a Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Fri, 24 Feb 2012 17:47:02 +0000 Subject: [PATCH 008/102] Update date and version. --- Installation/auxiliary/cgal_create_cmake_script.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/auxiliary/cgal_create_cmake_script.1 b/Installation/auxiliary/cgal_create_cmake_script.1 index 0e203382a95..78fccf7e86c 100644 --- 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" "August 2011" "CGAL 3.9" "User Commands" +.TH CGAL_CREATE_CMAKE_SCRIPT "1" "March 2012" "CGAL 4.0" "User Commands" .SH NAME cgal_create_cmake_script \- create a cmake script for applications using CGAL .SH SYNOPSIS From f91d43c47b813fe41858d608b556df718a6040c1 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Tue, 28 Feb 2012 14:09:46 +0000 Subject: [PATCH 009/102] Add const. --- Manual_tools/src/basic.cpp | 2 +- Manual_tools/src/basic.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Manual_tools/src/basic.cpp b/Manual_tools/src/basic.cpp index b211fd4a8f8..69dd678003c 100644 --- a/Manual_tools/src/basic.cpp +++ b/Manual_tools/src/basic.cpp @@ -23,7 +23,7 @@ extern "C" { // Own assertion macro // ================================================ -void cc_assertion_error( char *cond, char *fname, int line) { +void cc_assertion_error(const char *cond, const char *fname, int line) { cerr << endl << "fatal error: assertion '" << cond << "' failed in line " << line << " of file '" << fname << "'." << endl; abort(); diff --git a/Manual_tools/src/basic.h b/Manual_tools/src/basic.h index 5a4ba9d1025..f43e5ba0aac 100644 --- a/Manual_tools/src/basic.h +++ b/Manual_tools/src/basic.h @@ -24,7 +24,7 @@ using namespace std; // Own assertion macro // ================================================ -void cc_assertion_error( char *cond, char *fname, int line); +void cc_assertion_error(const char *cond, const char *fname, int line); #if !NDEBUG #define CC_Assert( cond) {\ From a3c0177518573aa0ca79bf668f02e2ebe27aa169 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 6 Mar 2012 15:15:13 +0000 Subject: [PATCH 010/102] Prepare CGAL-4.0 --- Maintenance/release_building/public_release_name | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name index 7f0155377ea..2a1044df168 100644 --- a/Maintenance/release_building/public_release_name +++ b/Maintenance/release_building/public_release_name @@ -1 +1 @@ -CGAL-4.0-beta1 +CGAL-4.0-rc1 From fdac8b38d6b280ed1bb8a6e2771fee86ab479471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 7 Mar 2012 16:21:06 +0000 Subject: [PATCH 011/102] doc bugfix: class Delaunay_triangulation_3 inherits from --- .../doc_tex/Triangulation_3_ref/Delaunay_triangulation_3.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Triangulation_3/doc_tex/Triangulation_3_ref/Delaunay_triangulation_3.tex b/Triangulation_3/doc_tex/Triangulation_3_ref/Delaunay_triangulation_3.tex index 0e8ec51b8b3..2a551fccafc 100644 --- a/Triangulation_3/doc_tex/Triangulation_3_ref/Delaunay_triangulation_3.tex +++ b/Triangulation_3/doc_tex/Triangulation_3_ref/Delaunay_triangulation_3.tex @@ -48,7 +48,7 @@ An example of use can be found in the user manual~\ref{Triangulation3-ex-fast-location}. -\ccInheritsFrom{\ccc{Triangulation_3}} +\ccInheritsFrom{\ccc{Triangulation_3::Triangulation_data_structure >}} \ccTypes From 2e04afe1a29fb41243d0e44653a34a367903cf97 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 8 Mar 2012 13:55:09 +0000 Subject: [PATCH 012/102] Fix the rel="canonical" link of several pages The following pages are generated differently, using open_tmp_file. For those pages, the macro \lciFilename was wrong. - acknowledge.html - biblio.html - title.html --- Manual_tools/src/internal_macros.cpp | 2 +- Manual_tools/src/output.cpp | 12 ++++++++---- Manual_tools/src/output.h | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Manual_tools/src/internal_macros.cpp b/Manual_tools/src/internal_macros.cpp index c2231363569..26f2b3b1479 100644 --- a/Manual_tools/src/internal_macros.cpp +++ b/Manual_tools/src/internal_macros.cpp @@ -1247,7 +1247,7 @@ string open_tmp_file( const string&, string param[], size_t n, size_t opt) { NParamCheck( 1, 0); remove_separator( param[0]); - push_current_output_w_filename( tmp_path + expandFirstMacro(param[0]) ); + push_current_output_w_filename( expandFirstMacro(param[0]), tmp_path ); return string(); } diff --git a/Manual_tools/src/output.cpp b/Manual_tools/src/output.cpp index bdcd36cc437..3519662be26 100644 --- a/Manual_tools/src/output.cpp +++ b/Manual_tools/src/output.cpp @@ -268,13 +268,17 @@ void push_current_output( const string& key) { set_current_output( key); } -void push_current_output_w_filename( const string& filename) { +void push_current_output_w_filename( string filename, + const string path) { push_current_output(); - current_ostream = open_file_for_write( filename); current_filename = filename; - current_basename = basename_string( current_filename); + if( !path.empty() ) { + filename = path + filename; + } + current_ostream = open_file_for_write( filename); + current_basename = basename_string( filename); current_rootname = rootname_string( current_basename); - current_filepath = path_string( current_filename); + current_filepath = path_string( filename); current_uppath = uppath_string( current_filepath); insertInternalGlobalMacro( "\\lciOutputFilename",current_filename); insertInternalGlobalMacro( "\\lciOutputBasename",current_basename); diff --git a/Manual_tools/src/output.h b/Manual_tools/src/output.h index 654d98d1d90..447ff223476 100644 --- a/Manual_tools/src/output.h +++ b/Manual_tools/src/output.h @@ -95,7 +95,7 @@ void push_current_output(); void pop_current_output(); void set_current_output( const string& key); void push_current_output( const string& key); -void push_current_output_w_filename( const string& filename); +void push_current_output_w_filename(string filename, const string path = ""); extern ostringstream* savebox_stream; From a44e6bff929cd8e75f71c4f183c8550916e0beba Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 9 Mar 2012 15:41:21 +0000 Subject: [PATCH 013/102] Prepare official release CGAL-4.0, planned on Monday morning. --- Maintenance/release_building/public_release_name | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name index 2a1044df168..a02af09226e 100644 --- a/Maintenance/release_building/public_release_name +++ b/Maintenance/release_building/public_release_name @@ -1 +1 @@ -CGAL-4.0-rc1 +CGAL-4.0 From e299fae868103d97aa2e5271d8ae971063cd1c75 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 12 Mar 2012 14:42:23 +0000 Subject: [PATCH 014/102] next targets CGAL-4.1 --- Maintenance/release_building/MINOR_NUMBER | 2 +- Maintenance/release_building/public_release_name | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Maintenance/release_building/MINOR_NUMBER b/Maintenance/release_building/MINOR_NUMBER index 573541ac970..d00491fd7e5 100644 --- a/Maintenance/release_building/MINOR_NUMBER +++ b/Maintenance/release_building/MINOR_NUMBER @@ -1 +1 @@ -0 +1 diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name index a02af09226e..3ab64670a53 100644 --- a/Maintenance/release_building/public_release_name +++ b/Maintenance/release_building/public_release_name @@ -1 +1 @@ -CGAL-4.0 +CGAL-4.1-dev From f86d5563c668b0da412106b572f6506fcccbffee Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 12 Mar 2012 15:18:03 +0000 Subject: [PATCH 015/102] updated crontab (automated commit) --- Maintenance/infrastructure/cgal.geometryfactory.com/crontab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 68e8ca4b6ce..8933715e931 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -16,7 +16,7 @@ # Create internal release # The script also updates the manual tools. # "next" alone -0 21 * * Mon,Tue,Wed,Thu,Fri,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it +#0 21 * * Mon,Tue,Wed,Thu,Fri,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it #0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it # "next" + candidates @@ -25,7 +25,7 @@ # - on trunk #0 21 * * Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it # - from branch 3.9 -0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --public --do-it +#0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --public --do-it # A test that does not work #30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename From 634bc32fc5bb4a07c07a9659d1fffc58ba114c6e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 12 Mar 2012 15:56:36 +0000 Subject: [PATCH 016/102] Announcement text for CGAL-4.0 --- .gitattributes | 1 + .../public_release/announcement/CGAL-4.0 | 97 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 Maintenance/public_release/announcement/CGAL-4.0 diff --git a/.gitattributes b/.gitattributes index 0b9f6e1dd28..f2abd287a32 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2197,6 +2197,7 @@ Maintenance/public_release/announcement/CGAL-3.8-beta -text Maintenance/public_release/announcement/CGAL-3.8.1 -text Maintenance/public_release/announcement/CGAL-3.9 -text Maintenance/public_release/announcement/CGAL-3.9-beta1 -text +Maintenance/public_release/announcement/CGAL-4.0 -text Maintenance/public_release/announcement/CGAL-4.0-beta1 -text Maintenance/public_release/scripts/precompiled_demos_zips -text Maintenance/public_release/scripts/prepare_release -text diff --git a/Maintenance/public_release/announcement/CGAL-4.0 b/Maintenance/public_release/announcement/CGAL-4.0 new file mode 100644 index 00000000000..8431092269b --- /dev/null +++ b/Maintenance/public_release/announcement/CGAL-4.0 @@ -0,0 +1,97 @@ +Subject: CGAL 4.0 Released, Computational Geometry Algorithms Library +Body: + +The CGAL Open Source Project is pleased to announce the release 4.0 +of CGAL, the Computational Geometry Algorithms Library. + +CGAL 4.0 differs from version 3.x in licensing, and in functionality. +We increased the major number of the CGAL version to '4' in order to +reflect this license change. + +The license has been changed from LGPLv2.1 to LGPLv3+ +(GNU Lesser General Public License) and from QPL (Q Public License v1.0) +to GPLv3+ (GNU Public License), depending on each package. +These license changes are not fundamental, that is, the licenses +are similar in their spirit, and the change reflects the fact +that the QPL has become marginal, since it had been introduced +and later abandoned for Qt. + + +Major changes in this release include the following: + +o Linear Cell Complex (new package) + + This package implements linear cell complexes, objects in + dimension d with linear geometry. They are based on the + Combinatorial Map where points are associated to vertices. + + +o 2D Voronoi Diagram Adaptor (temporarily removed) + + As the copyright holder of this package has not granted + the right to switch from QPL to GPL, this package is + temporarily removed from the distribution. + + +o 2D and 3D Alpha Shapes + + Make it more robust for the Exact_predicates_inexact_constructions_kernel + + +o AABB Tree, Spatial Searching + + Queries on these data structures are now multi-thread safe. + + +o Surface Reconstruction from Point Sets, + Planar Parameterization of Triangulated Surface Meshes, + Approximation of Ridges and Umbilics on Triangulated Surface Meshes, and + Estimation of Local Differential Properties of Point-Sampled Surfaces + + If you use the Eigen library (http://eigen.tuxfamily.org), + these packages no longer need Taucs, Lapack or Blas. + + + +See http://www.cgal.org/releases.html for a complete list of changes. + + +The CGAL project is a collaborative effort to develop a robust, +easy-to-use, and efficient C++ software library of geometric data +structures and algorithms, like +- triangulations (2D constrained triangulations and Delaunay + triangulations in 2D and 3D, periodic triangulations), +- Voronoi diagrams (for 2D and 3D points, 2D additively weighted + Voronoi diagrams, and segment Voronoi diagrams), +- Boolean operations on polygons and polyhedra, +- regularized Boolean operations on polygons with curved arcs +- arrangements of curves, +- mesh generation (2D, 3D and surface mesh generation, + surface mesh subdivision and parametrization), +- alpha shapes (in 2D and 3D), +- convex hull algorithms (in 2D, 3D and dD), +- operations on polygons (straight skeleton and offset polygon), +- search structures (kd trees for nearest neighbor search, and + range and segment trees), +- interpolation (natural neighbor interpolation and placement of + streamlines), +- optimization algorithms (smallest enclosing sphere of points or + spheres, smallest enclosing ellipsoid of points, principal + component analysis), +- kinetic data structures + + + + +Some modules are distributed under the terms of the LGPL Open Source +license (GNU Lesser General Public License v3 or later versions). +Most modules are distributed under the terms of the GPL Open Source +license (GNU General Public License v3 or later versions). +If your intended usage does not meet the criteria of the +aforementioned licenses, a commercial license can be purchased from +GeometryFactory (http://www.geometryfactory.com/). + + +For further information and for downloading the library and its +documentation, please visit the CGAL web site: http://www.cgal.org/ + From 69208fc8f2021223216115e50ca0390fd556f26e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 12 Mar 2012 16:20:14 +0000 Subject: [PATCH 017/102] Increase the SOVERSION for CGAL-4.1 --- Installation/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index a0ef19acc79..3f2582a4c23 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -299,10 +299,11 @@ message( STATUS "CGAL_BUGFIX_VERSION=${CGAL_BUGFIX_VERSION}" ) # std::size_t, which is different on some platforms) # CGAL-3.8 : 7.0.0 (At least CGAL::Random has changed its member fields.) # CGAL-3.9 : 8.0.0 (No way to check the binary compatibility.) -# CGAL-3.10 : 9.0.0 (No way to check the binary compatibility.) +# CGAL-4.0 : 9.0.0 (No way to check the binary compatibility.) +# CGAL-4.1: : 10.0.0 (No way to check the binary compatibility.) -set( CGAL_SONAME_VERSION "9" ) -set( CGAL_SOVERSION "9.0.0" ) +set( CGAL_SONAME_VERSION "10" ) +set( CGAL_SOVERSION "10.0.0" ) message( STATUS "CGAL_SONAME_VERSION=${CGAL_SONAME_VERSION}" ) message( STATUS "CGAL_SOVERSION =${CGAL_SOVERSION}" ) From bd1b82bc90aeeff624cf852b702526ddf5935f0b Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Mon, 12 Mar 2012 19:56:31 +0000 Subject: [PATCH 018/102] update Debian packaging information --- .gitattributes | 18 +- Maintenance/deb/ANNOUNCEMENT.beta | 27 +-- Maintenance/deb/ANNOUNCEMENT.final | 19 +- Maintenance/deb/README | 15 +- Maintenance/deb/sid/debian/README.source | 14 +- Maintenance/deb/sid/debian/changelog | 41 ++++ Maintenance/deb/sid/debian/compat | 2 +- Maintenance/deb/sid/debian/control | 28 ++- Maintenance/deb/sid/debian/copyright | 222 ++++++----------- .../deb/sid/debian/libcgal-demo.install | 4 +- Maintenance/deb/sid/debian/libcgal8.install | 2 - Maintenance/deb/sid/debian/libcgal8.shlibs | 4 - Maintenance/deb/sid/debian/libcgal9.install | 2 + Maintenance/deb/sid/debian/libcgal9.shlibs | 4 + .../deb/sid/debian/patches/{00list => series} | 0 Maintenance/deb/sid/debian/rules | 116 ++------- Maintenance/deb/sid/debian/source/format | 2 +- Maintenance/deb/squeeze/debian/README.source | 14 +- Maintenance/deb/squeeze/debian/changelog | 42 +++- Maintenance/deb/squeeze/debian/compat | 2 +- Maintenance/deb/squeeze/debian/control | 26 +- Maintenance/deb/squeeze/debian/copyright | 222 ++++++----------- .../deb/squeeze/debian/libcgal-demo.install | 4 +- .../deb/squeeze/debian/libcgal8.install | 2 - .../deb/squeeze/debian/libcgal8.shlibs | 4 - .../deb/squeeze/debian/libcgal9.install | 2 + .../deb/squeeze/debian/libcgal9.shlibs | 4 + .../patches/ipe-default-to-version-7.dpatch | 19 -- .../squeeze/debian/patches/{00list => series} | 0 Maintenance/deb/squeeze/debian/rules | 116 ++------- Maintenance/deb/squeeze/debian/source/format | 2 +- Maintenance/deb/wheezy/debian/README.source | 14 +- Maintenance/deb/wheezy/debian/changelog | 43 +++- Maintenance/deb/wheezy/debian/compat | 2 +- Maintenance/deb/wheezy/debian/control | 28 ++- Maintenance/deb/wheezy/debian/copyright | 224 ++++++------------ .../deb/wheezy/debian/libcgal-demo.install | 4 +- .../deb/wheezy/debian/libcgal8.install | 2 - Maintenance/deb/wheezy/debian/libcgal8.shlibs | 4 - .../deb/wheezy/debian/libcgal9.install | 2 + Maintenance/deb/wheezy/debian/libcgal9.shlibs | 4 + .../wheezy/debian/patches/{00list => series} | 0 Maintenance/deb/wheezy/debian/rules | 116 ++------- Maintenance/deb/wheezy/debian/source/format | 2 +- 44 files changed, 578 insertions(+), 846 deletions(-) delete mode 100644 Maintenance/deb/sid/debian/libcgal8.install delete mode 100644 Maintenance/deb/sid/debian/libcgal8.shlibs create mode 100644 Maintenance/deb/sid/debian/libcgal9.install create mode 100644 Maintenance/deb/sid/debian/libcgal9.shlibs rename Maintenance/deb/sid/debian/patches/{00list => series} (100%) delete mode 100644 Maintenance/deb/squeeze/debian/libcgal8.install delete mode 100644 Maintenance/deb/squeeze/debian/libcgal8.shlibs create mode 100644 Maintenance/deb/squeeze/debian/libcgal9.install create mode 100644 Maintenance/deb/squeeze/debian/libcgal9.shlibs delete mode 100755 Maintenance/deb/squeeze/debian/patches/ipe-default-to-version-7.dpatch rename Maintenance/deb/squeeze/debian/patches/{00list => series} (100%) delete mode 100644 Maintenance/deb/wheezy/debian/libcgal8.install delete mode 100644 Maintenance/deb/wheezy/debian/libcgal8.shlibs create mode 100644 Maintenance/deb/wheezy/debian/libcgal9.install create mode 100644 Maintenance/deb/wheezy/debian/libcgal9.shlibs rename Maintenance/deb/wheezy/debian/patches/{00list => series} (100%) diff --git a/.gitattributes b/.gitattributes index f2abd287a32..1e03b25677e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2097,9 +2097,9 @@ Maintenance/deb/sid/debian/control -text Maintenance/deb/sid/debian/libcgal-demo.install -text Maintenance/deb/sid/debian/libcgal-dev.install -text Maintenance/deb/sid/debian/libcgal-ipelets.install -text -Maintenance/deb/sid/debian/libcgal8.install -text -Maintenance/deb/sid/debian/libcgal8.shlibs -text -Maintenance/deb/sid/debian/patches/00list -text +Maintenance/deb/sid/debian/libcgal9.install -text +Maintenance/deb/sid/debian/libcgal9.shlibs -text +Maintenance/deb/sid/debian/patches/series -text Maintenance/deb/sid/debian/rules -text Maintenance/deb/sid/debian/source/format -text Maintenance/deb/sid/debian/watch -text @@ -2111,9 +2111,9 @@ Maintenance/deb/squeeze/debian/control -text Maintenance/deb/squeeze/debian/libcgal-demo.install -text Maintenance/deb/squeeze/debian/libcgal-dev.install -text Maintenance/deb/squeeze/debian/libcgal-ipelets.install -text -Maintenance/deb/squeeze/debian/libcgal8.install -text -Maintenance/deb/squeeze/debian/libcgal8.shlibs -text -Maintenance/deb/squeeze/debian/patches/00list -text +Maintenance/deb/squeeze/debian/libcgal9.install -text +Maintenance/deb/squeeze/debian/libcgal9.shlibs -text +Maintenance/deb/squeeze/debian/patches/series -text Maintenance/deb/squeeze/debian/rules -text Maintenance/deb/squeeze/debian/source/format -text Maintenance/deb/squeeze/debian/watch -text @@ -2125,9 +2125,9 @@ Maintenance/deb/wheezy/debian/control -text Maintenance/deb/wheezy/debian/libcgal-demo.install -text Maintenance/deb/wheezy/debian/libcgal-dev.install -text Maintenance/deb/wheezy/debian/libcgal-ipelets.install -text -Maintenance/deb/wheezy/debian/libcgal8.install -text -Maintenance/deb/wheezy/debian/libcgal8.shlibs -text -Maintenance/deb/wheezy/debian/patches/00list -text +Maintenance/deb/wheezy/debian/libcgal9.install -text +Maintenance/deb/wheezy/debian/libcgal9.shlibs -text +Maintenance/deb/wheezy/debian/patches/series -text Maintenance/deb/wheezy/debian/rules -text Maintenance/deb/wheezy/debian/source/format -text Maintenance/deb/wheezy/debian/watch -text diff --git a/Maintenance/deb/ANNOUNCEMENT.beta b/Maintenance/deb/ANNOUNCEMENT.beta index fef024305a8..5b5e17fa4e4 100644 --- a/Maintenance/deb/ANNOUNCEMENT.beta +++ b/Maintenance/deb/ANNOUNCEMENT.beta @@ -1,27 +1,24 @@ -Debian packages for CGAL 3.6 Beta 1 are now available for i386 and +Debian packages for CGAL 4.0 Beta 1 are now available for i386 and amd64. To download the packages via apt-get you need to add -deb http://www.joachim-reichel.de/debian/repository lenny non-free -deb-src http://www.joachim-reichel.de/debian/repository lenny non-free + deb http://www.joachim-reichel.de/debian/repository squeeze main + deb-src http://www.joachim-reichel.de/debian/repository squeeze main -or + deb http://www.joachim-reichel.de/debian/repository wheezy main + deb-src http://www.joachim-reichel.de/debian/repository wheezy main -deb http://www.joachim-reichel.de/debian/repository squeeze non-free -deb-src http://www.joachim-reichel.de/debian/repository squeeze non-free - -or - -deb http://www.joachim-reichel.de/debian/repository sid non-free -deb-src http://www.joachim-reichel.de/debian/repository sid non-free + deb http://www.joachim-reichel.de/debian/repository sid main + deb-src http://www.joachim-reichel.de/debian/repository sid main to /etc/apt/sources.list (you only need the pair of lines corresponding -to the release you are using). The packages are called libcgal7, -libcgal-dev, libcgal-demo, and libcgal-ipelets. +to the release you are using). The packages are called libcgal9, +libcgal-dev, libcgal-demo, and libcgal-ipelets. (Note: the repository +component has changed from "non-free" to "main".) In case you want to download the packages manually, have a look at -http://www.joachim-reichel.de/debian/repository/pool/non-free/c/cgal/ +http://www.joachim-reichel.de/debian/repository/pool/main/c/cgal/ -For the final 3.8 release, similar packages will be uploaded to the +For the final 4.0 release, similar packages will be uploaded to the official Debian repository and/or be available from the CGAL web site. See also http://www.cgal.org/FAQ.html#debian_packages . diff --git a/Maintenance/deb/ANNOUNCEMENT.final b/Maintenance/deb/ANNOUNCEMENT.final index fb3b9939636..631602f75f1 100644 --- a/Maintenance/deb/ANNOUNCEMENT.final +++ b/Maintenance/deb/ANNOUNCEMENT.final @@ -1,15 +1,18 @@ -Debian packages for CGAL 3.8 are now available as well. Simply add +Debian packages for CGAL 4.0 are now available as well. Simply add -deb ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main contrib non-free -deb-src ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main contrib non-free + deb ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main + deb-src ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main -or - -deb ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian wheezy main contrib non-free -deb-src ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian wheezy main contrib non-free + deb ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian wheezy main + deb-src ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian wheezy main to /etc/apt/sources list (you only need the pair of lines corresponding to the release you are using). For sid, packages should be available -from the official Debian repository in a few days. +from the official Debian repository in a few days. The packages are called +libcgal9, libcgal-dev, libcgal-demo, and libcgal-ipelets. (Note: the +repository component has changed from "non-free" to "main".) + +In case you want to download the packages manually, have a look at +ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian/pool/main/c/cgal/ See also http://www.cgal.org/FAQ.html#debian_packages . diff --git a/Maintenance/deb/README b/Maintenance/deb/README index bf8ce0bd22a..89d98c73268 100644 --- a/Maintenance/deb/README +++ b/Maintenance/deb/README @@ -21,22 +21,23 @@ backport for squeeze: Tags ---- -svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.9-1 -svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/3.9-1~wheezy1 -svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.9-1~squeeze1 +svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 +svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 +svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 or: -svn copy $SVNROOT/branches/CGAL-3.9-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.9-1 -svn copy $SVNROOT/branches/CGAL-3.9-branch/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/3.9-1~wheezy1 -svn copy $SVNROOT/branches/CGAL-3.9-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.9-1~squeeze1 +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 FTP server ---------- -wget http://www.joachim-reichel.de/tmp/cgal-3.9.tar.bz2 +wget http://www.joachim-reichel.de/tmp/cgal-4.0.tar.bz2 su cgal cd /ftp/pub/outgoing/CGAL/debian mv pool/non-free/c/cgal/* archive rm -fr dists pool tar xjf /path/to/downloaded/tarball +# There should be 3 subdirectories "archive", "dists", and "pool" now. diff --git a/Maintenance/deb/sid/debian/README.source b/Maintenance/deb/sid/debian/README.source index d191338a4aa..662cd01c5da 100644 --- a/Maintenance/deb/sid/debian/README.source +++ b/Maintenance/deb/sid/debian/README.source @@ -1,7 +1,11 @@ -README.source -------------- +normalize-audio for Debian +-------------------------- -The package uses dpatch to manage patches to the original source. -See /usr/share/doc/dpatch/README.source.gz for details. +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and +applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + + -- Joachim Reichel Sun, 15 Jan 2012 14:38:04 +0100 - -- Joachim Reichel Mon, 28 Sep 2009 21:19:03 +0200 diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index ae845463e7d..002950ebb83 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -1,3 +1,44 @@ +cgal (4.0-1) unstable; urgency=low + + * New upstream release. + * Move from non-free to main due to upstream license change from QPL + to GPL 3+ (and from LGPL 2.1 to LGPL 3+), updated debian/copyright + accordingly. + * Rename binary package libcgal8 to libcgal9 to reflect SONAME change. + * Update Standards-Version to 3.9.3 (no changes needed). + * Remove fix-ipe-version-detection.dpatch and + fix-qt-moc-parse-error.dpatch (fixed upstream). + * Removed libmagick++9-dev from Suggests: of libcgal-demo, because + that package does no longer exists. + + -- Joachim Reichel Mon, 12 Mar 2012 19:14:55 +0100 + +cgal (3.9-4) unstable; urgency=low + + * Rebuild against boost 1.48 (Closes: #659358). + * Add fix-qt-moc-parse-error.dpatch as workaround for + https://bugreports.qt-project.org/browse/QTBUG-22829. + + -- Joachim Reichel Fri, 10 Feb 2012 22:41:26 +0100 + +cgal (3.9-3) unstable; urgency=low + + * Fix FTBFS when building only architecture dependent packages caused + by recent transition to the new packaging format (Closes: #658191). + + -- Joachim Reichel Wed, 01 Feb 2012 00:07:03 +0100 + +cgal (3.9-2) unstable; urgency=low + + * Changed packaging format to "3.0 (quilt)". + * Add fix-ipe-version-detection.dpatch: upstream patch for bug #643278. + Remove workaround. + * Tighten Depends: of libcgal-ipelets on ipe (Closes: #657720). + * Move libcgal-ipelets to Section: graphics. + * Add libqt4-opengl-dev to Suggests: of libcgal-demo. + + -- Joachim Reichel Mon, 30 Jan 2012 19:04:18 +0100 + cgal (3.9-1) unstable; urgency=low * New upstream release. diff --git a/Maintenance/deb/sid/debian/compat b/Maintenance/deb/sid/debian/compat index 7f8f011eb73..45a4fb75db8 100644 --- a/Maintenance/deb/sid/debian/compat +++ b/Maintenance/deb/sid/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/Maintenance/deb/sid/debian/control b/Maintenance/deb/sid/debian/control index 10afacf861c..96968eeb5c7 100644 --- a/Maintenance/deb/sid/debian/control +++ b/Maintenance/deb/sid/debian/control @@ -1,16 +1,16 @@ Source: cgal -Section: non-free/libs Priority: optional Maintainer: Joachim Reichel # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake -Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev, - libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, - libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev, + libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, + libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe +Standards-Version: 3.9.3 +Section: libs Homepage: http://www.cgal.org/ XS-Autobuild: yes -Package: libcgal8 +Package: libcgal9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C++ library for computational geometry @@ -31,9 +31,9 @@ Description: C++ library for computational geometry visualisation, and I/O, and other support facilities. Package: libcgal-dev -Section: non-free/libdevel +Section: libdevel Architecture: any -Depends: libcgal8 (= ${binary:Version}), libboost-dev, +Depends: libcgal9 (= ${binary:Version}), libboost-dev, libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} Description: C++ library for computational geometry (development files) @@ -45,13 +45,13 @@ Description: C++ library for computational geometry (development files) This package contains the header files and static libraries. Package: libcgal-demo -Section: non-free/devel +Section: devel Architecture: all -Depends: libcgal-dev (>= ${binary:Version}), libcgal8 (>= ${binary:Version}), - ${misc:Depends} +Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}), + ${misc:Depends} Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev, - libmagick++-dev | libmagick++9-dev, qt4-dev-tools + libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev Description: C++ library for computational geometry (demos) CGAL (Computational Geometry Algorithms Library) makes the most important of the solutions and methods developed in computational geometry available @@ -61,8 +61,10 @@ Description: C++ library for computational geometry (demos) This package contains the demos and examples. Package: libcgal-ipelets +Section: graphics Architecture: any -Depends: libcgal8 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} +Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+), + ${shlibs:Depends}, ${misc:Depends} Conflicts: libcgal5-ipelets Replaces: libcgal5-ipelets Description: C++ library for computational geometry (ipelets) diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index 9d0295b8ecf..269a926c941 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -3,14 +3,10 @@ Thu, 29 Apr 2004 18:43:18 +0200. It was downloaded from http://www.cgal.org/download/index.html. -The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 -Joachim Reichel and is licensed under the LGPL license, -either version 3 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-3. - -The package is not in main, but in non-free since parts of it are licensed -under the QPL. This license is not DFSG-free, but it permits one to autobuild -the package and to redistribute it in the non-free archive. +The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, +2010, 2011, 2012 Joachim Reichel and is licensed +under the LGPL license, version 2.1 or later (at your option), which can +be found in /usr/share/common-licenses/LGPL-2.1. @@ -156,23 +152,24 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which - license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 3 of the License) - or the Q Public License (version 1.0), *depending on each file*. The texts - of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. + license applies to it. This is either the GNU General Public License + or the GNU Lesser General Public License (as published by the Free Software + Foundation; either version 3 of the License or (at your option) any later + version). The texts of both licenses can be found in the files LICENSE.GPL + and LICENSE.LGPL. Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is - licensed under the QPL (see LICENSE.QPL). + licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). + (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -190,10 +187,11 @@ The following copyright statement is taken from include/CGAL/config.h. The year numbers and the set of copyright holders (see list above) varies from file to file. - Copyright (c) 1997-2004 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + Copyright (c) 1997-2010 + Utrecht University (The Netherlands), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. This file is part of CGAL (www.cgal.org); you can redistribute it and/or @@ -209,7 +207,7 @@ file to file. -Copyright statement for QPL'd files +Copyright statement for GPL'd files =================================== The following copyright statement is taken from include/CGAL/Width_3.h. The @@ -219,9 +217,10 @@ file to file. Copyright (c) 1997-2000 ETH Zurich (Switzerland). All rights reserved. - This file is part of CGAL (www.cgal.org); you may redistribute it under - the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CGAL. + This file is part of CGAL (www.cgal.org). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -236,9 +235,9 @@ Copright statement for files under the FREE_USE license Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -264,6 +263,51 @@ distributed with CGAL: +Boost +===== + +The following files are modified versions originating from Boost: + + ./include/CGAL/internal/boost/mutable_heap.hpp + ./include/CGAL/internal/boost/array_binary_tree.hpp + ./include/CGAL/internal/boost/mutable_queue.hpp + Copyright 1997, 1998, 1999, 2000 University of Notre Dame. + + ./include/CGAL/internal/container_fwd_fixed.hpp + Copyright 2005-2008 Daniel James. + + ./include/CGAL/auto_link/auto_link.h + (C) Copyright John Maddock 2003. + +All of these files are distributed under the Boost Software License, +version 1.0. + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + + CORE ==== @@ -274,9 +318,10 @@ src/CGALCore and include/CGAL/CORE. Copyright (c) 1995-2004 Exact Computation Project All rights reserved. - This file is part of CORE (http://cs.nyu.edu/exact/core/); you may - redistribute it under the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CORE. + This file is part of CORE (http://cs.nyu.edu/exact/core/). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the @@ -315,8 +360,7 @@ OpenNL The following copyright statement applies to the OpenNL library in include/CGAL/OpenNL. - author: Bruno Levy, INRIA, project ALICE - website: http://www.loria.fr/~levy/software + Copyright (c) 2005-2008 Inria Loria (France). This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -327,116 +371,6 @@ include/CGAL/OpenNL. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-3. - If not, write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301, USA - - - -LICENSE.QPL -=========== - - THE Q PUBLIC LICENSE - version 1.0 - - Copyright (C) 1999-2000 Troll Tech AS, Norway. - Everyone is permitted to copy and - distribute this license document. - -The intent of this license is to establish freedom to share and change the -software regulated by this license under the open source model. - -This license applies to any software containing a notice placed by the -copyright holder saying that it may be distributed under the terms of -the Q Public License version 1.0. Such software is herein referred to as -the Software. This license covers modification and distribution of the -Software, use of third-party application programs based on the Software, -and development of free software which uses the Software. - - Granted Rights - -1. You are granted the non-exclusive rights set forth in this license - provided you agree to and comply with any and all conditions in this - license. Whole or partial distribution of the Software, or software - items that link with the Software, in any form signifies acceptance of - this license. - -2. You may copy and distribute the Software in unmodified form provided - that the entire package, including - but not restricted to - copyright, - trademark notices and disclaimers, as released by the initial developer - of the Software, is distributed. - -3. You may make modifications to the Software and distribute your - modifications, in a form that is separate from the Software, such as - patches. The following restrictions apply to modifications: - - a. Modifications must not alter or remove any copyright notices in - the Software. - - b. When modifications to the Software are released under this - license, a non-exclusive royalty-free right is granted to the - initial developer of the Software to distribute your modification - in future versions of the Software provided such versions remain - available under these terms in addition to any other license(s) of - the initial developer. - -4. You may distribute machine-executable forms of the Software or - machine-executable forms of modified versions of the Software, provided - that you meet these restrictions: - - a. You must include this license document in the distribution. - - b. You must ensure that all recipients of the machine-executable forms - are also able to receive the complete machine-readable source code - to the distributed Software, including all modifications, without - any charge beyond the costs of data transfer, and place prominent - notices in the distribution explaining this. - - c. You must ensure that all modifications included in the - machine-executable forms are available under the terms of this - license. - -5. You may use the original or modified versions of the Software to - compile, link and run application programs legally developed by you - or by others. - -6. You may develop application programs, reusable components and other - software items that link with the original or modified versions of the - Software. These items, when distributed, are subject to the following - requirements: - - a. You must ensure that all recipients of machine-executable forms of - these items are also able to receive and use the complete - machine-readable source code to the items without any charge - beyond the costs of data transfer. - - b. You must explicitly license all recipients of your items to use - and re-distribute original and modified versions of the items in - both machine-executable and source code forms. The recipients must - be able to do so without any charges whatsoever, and they must be - able to re-distribute to anyone they choose. - - - c. If the items are not available to the general public, and the - initial developer of the Software requests a copy of the items, - then you must supply one. - - Limitations of Liability - -In no event shall the initial developers or copyright holders be liable -for any damages whatsoever, including - but not restricted to - lost -revenue or profits or other direct, indirect, special, incidental or -consequential damages, even if they have been advised of the possibility -of such damages, except to the extent invariable law, if any, provides -otherwise. - - No Warranty - -The Software and this license document are provided AS IS with NO WARRANTY -OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. - Choice of Law - -This license is governed by the Laws of Norway. Disputes shall be settled -by Oslo City Court. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Maintenance/deb/sid/debian/libcgal-demo.install b/Maintenance/deb/sid/debian/libcgal-demo.install index b942c0b1210..8370a7dad2c 100644 --- a/Maintenance/deb/sid/debian/libcgal-demo.install +++ b/Maintenance/deb/sid/debian/libcgal-demo.install @@ -1,2 +1,2 @@ -usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal8 -usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal8 +usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal9 +usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal9 diff --git a/Maintenance/deb/sid/debian/libcgal8.install b/Maintenance/deb/sid/debian/libcgal8.install deleted file mode 100644 index f59a64a1671..00000000000 --- a/Maintenance/deb/sid/debian/libcgal8.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* usr/lib -usr/share/doc/cgal/changelog usr/share/doc/libcgal8 diff --git a/Maintenance/deb/sid/debian/libcgal8.shlibs b/Maintenance/deb/sid/debian/libcgal8.shlibs deleted file mode 100644 index 2ccec271602..00000000000 --- a/Maintenance/deb/sid/debian/libcgal8.shlibs +++ /dev/null @@ -1,4 +0,0 @@ -libCGAL 8 libcgal8 -libCGAL_Core 8 libcgal8 -libCGAL_ImageIO 8 libcgal8 -libCGAL_Qt4 8 libcgal8 diff --git a/Maintenance/deb/sid/debian/libcgal9.install b/Maintenance/deb/sid/debian/libcgal9.install new file mode 100644 index 00000000000..26d5c3fe99c --- /dev/null +++ b/Maintenance/deb/sid/debian/libcgal9.install @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* usr/lib +usr/share/doc/cgal/changelog usr/share/doc/libcgal9 diff --git a/Maintenance/deb/sid/debian/libcgal9.shlibs b/Maintenance/deb/sid/debian/libcgal9.shlibs new file mode 100644 index 00000000000..a313a97e930 --- /dev/null +++ b/Maintenance/deb/sid/debian/libcgal9.shlibs @@ -0,0 +1,4 @@ +libCGAL 9 libcgal9 +libCGAL_Core 9 libcgal9 +libCGAL_ImageIO 9 libcgal9 +libCGAL_Qt4 9 libcgal9 diff --git a/Maintenance/deb/sid/debian/patches/00list b/Maintenance/deb/sid/debian/patches/series similarity index 100% rename from Maintenance/deb/sid/debian/patches/00list rename to Maintenance/deb/sid/debian/patches/series diff --git a/Maintenance/deb/sid/debian/rules b/Maintenance/deb/sid/debian/rules index 6ad78108520..09da40e7bfa 100755 --- a/Maintenance/deb/sid/debian/rules +++ b/Maintenance/deb/sid/debian/rules @@ -1,24 +1,11 @@ #!/usr/bin/make -f -.NOTPARALLEL: - -# Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -g -endif +%: + dh $@ -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_BUILD_ARCH),alpha) - IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d -endif - -configure-stamp: patch-stamp - dh_testdir +override_dh_auto_configure: mkdir -p static cd static && QTDIR= cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ @@ -29,56 +16,33 @@ configure-stamp: patch-stamp -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF - touch configure-stamp - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: configure-stamp - dh_testdir - dh_prep - $(MAKE) -C static - $(MAKE) -C shared - mkdir -p shared/demo/CGAL_ipelets cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ - -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + +override_dh_auto_build: + $(MAKE) -C static + $(MAKE) -C shared $(MAKE) -C shared/demo/CGAL_ipelets +override_dh_auto_test: ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes1 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1 $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes2 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2 endif - touch build-stamp -clean: clean-patched unpatch -clean-patched: patch - dh_testdir - dh_testroot - $(MAKE) -C debian/tests clean - rm -fr shared static ipelets - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot -# dh_prep - dh_installdirs +override_dh_auto_clean: + dh_auto_clean + rm -fr shared static +override_dh_install: $(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install - - # see bug #643278 - # $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install - IPE_VERSION=`dpkg-query -W -f='$${Version}' libipe-dev | sed 's/-.*$$//'`; \ - mkdir -p debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets; \ - cp demo/CGAL_ipelets/lua/libCGAL_*.lua shared/demo/CGAL_ipelets/libCGAL_*.so \ - debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets + $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install mkdir -p debian/tmp/usr/share/cmake-2.8/Modules cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.8/Modules @@ -95,49 +59,21 @@ install: build dh_install --sourcedir=debian/tmp --list-missing - ln -s libcgal8 debian/libcgal-demo/usr/share/doc/libcgal-demo + mkdir -p debian/libcgal-demo/usr/share/doc + ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo mkdir -p debian/libcgal-dev/usr/share/doc - ln -s libcgal8 debian/libcgal-dev/usr/share/doc/libcgal-dev + ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev mkdir -p debian/libcgal-ipelets/usr/share/doc - ln -s libcgal8 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets + ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_installdocs: + dh_installdocs -plibcgal9 debian/copyright -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -plibcgal8 debian/copyright - dh_installchangelogs -plibcgal8 - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a -ldebian/libcgal8/usr/lib - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +override_dh_installchangelogs: + dh_installchangelogs -plibcgal9 -binary: binary-indep binary-arch +override_dh_shlibdeps: + dh_shlibdeps -a -ldebian/libcgal9/usr/lib -patch: patch-stamp -patch-stamp: - dpatch apply-all - touch patch-stamp - -unpatch: - dpatch deapply-all - rm -fr patch-stamp debian/patched - -.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch +override_dh_gencontrol: + dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'` diff --git a/Maintenance/deb/sid/debian/source/format b/Maintenance/deb/sid/debian/source/format index d3827e75a5c..163aaf8d82b 100644 --- a/Maintenance/deb/sid/debian/source/format +++ b/Maintenance/deb/sid/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/Maintenance/deb/squeeze/debian/README.source b/Maintenance/deb/squeeze/debian/README.source index d191338a4aa..662cd01c5da 100644 --- a/Maintenance/deb/squeeze/debian/README.source +++ b/Maintenance/deb/squeeze/debian/README.source @@ -1,7 +1,11 @@ -README.source -------------- +normalize-audio for Debian +-------------------------- -The package uses dpatch to manage patches to the original source. -See /usr/share/doc/dpatch/README.source.gz for details. +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and +applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + + -- Joachim Reichel Sun, 15 Jan 2012 14:38:04 +0100 - -- Joachim Reichel Mon, 28 Sep 2009 21:19:03 +0200 diff --git a/Maintenance/deb/squeeze/debian/changelog b/Maintenance/deb/squeeze/debian/changelog index d79af6748f1..db0555acf86 100644 --- a/Maintenance/deb/squeeze/debian/changelog +++ b/Maintenance/deb/squeeze/debian/changelog @@ -1,4 +1,44 @@ -cgal (3.9-1~squeeze1) stable; urgency=low +cgal (4.0-1~squeeze1) stable; urgency=low + + * New upstream release. + * Move from non-free to main due to upstream license change from QPL + to GPL 3+ (and from LGPL 2.1 to LGPL 3+), updated debian/copyright + accordingly. + * Rename binary package libcgal8 to libcgal9 to reflect SONAME change. + * Remove fix-ipe-version-detection.dpatch and + fix-qt-moc-parse-error.dpatch (fixed upstream). + * Removed libmagick++9-dev from Suggests: of libcgal-demo, because + that package does no longer exists. + + -- Joachim Reichel Mon, 12 Mar 2012 19:14:55 +0100 + +cgal (3.9-4) unstable; urgency=low + + * Rebuild against boost 1.48 (Closes: #659358). + * Add fix-qt-moc-parse-error.dpatch as workaround for + https://bugreports.qt-project.org/browse/QTBUG-22829. + + -- Joachim Reichel Fri, 10 Feb 2012 22:41:26 +0100 + +cgal (3.9-3) unstable; urgency=low + + * Fix FTBFS when building only architecture dependent packages caused + by recent transition to the new packaging format (Closes: #658191). + + -- Joachim Reichel Wed, 01 Feb 2012 00:07:03 +0100 + +cgal (3.9-2) unstable; urgency=low + + * Changed packaging format to "3.0 (quilt)". + * Add fix-ipe-version-detection.dpatch: upstream patch for bug #643278. + Remove workaround. + * Tighten Depends: of libcgal-ipelets on ipe (Closes: #657720). + * Move libcgal-ipelets to Section: graphics. + * Add libqt4-opengl-dev to Suggests: of libcgal-demo. + + -- Joachim Reichel Mon, 30 Jan 2012 19:04:18 +0100 + +cgal (3.9-1) unstable; urgency=low * New upstream release. * Rename binary package libcgal7 to libcgal8 to reflect SONAME change. diff --git a/Maintenance/deb/squeeze/debian/compat b/Maintenance/deb/squeeze/debian/compat index 7f8f011eb73..45a4fb75db8 100644 --- a/Maintenance/deb/squeeze/debian/compat +++ b/Maintenance/deb/squeeze/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/Maintenance/deb/squeeze/debian/control b/Maintenance/deb/squeeze/debian/control index e42346f1d49..ceeda03e0cd 100644 --- a/Maintenance/deb/squeeze/debian/control +++ b/Maintenance/deb/squeeze/debian/control @@ -1,16 +1,16 @@ Source: cgal -Section: non-free/libs Priority: optional Maintainer: Joachim Reichel # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake -Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev, - libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, - libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe +Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev, + libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, + libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe Standards-Version: 3.9.1 +Section: libs Homepage: http://www.cgal.org/ XS-Autobuild: yes -Package: libcgal8 +Package: libcgal9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C++ library for computational geometry @@ -31,9 +31,9 @@ Description: C++ library for computational geometry visualisation, and I/O, and other support facilities. Package: libcgal-dev -Section: non-free/libdevel +Section: libdevel Architecture: any -Depends: libcgal8 (= ${binary:Version}), libboost-dev, +Depends: libcgal9 (= ${binary:Version}), libboost-dev, libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} Description: C++ library for computational geometry (development files) @@ -45,13 +45,13 @@ Description: C++ library for computational geometry (development files) This package contains the header files and static libraries. Package: libcgal-demo -Section: non-free/devel +Section: devel Architecture: all -Depends: libcgal-dev (>= ${binary:Version}), libcgal8 (>= ${binary:Version}), - ${misc:Depends} +Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}), + ${misc:Depends} Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev, - libmagick++-dev | libmagick++9-dev, qt4-dev-tools + libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev Description: C++ library for computational geometry (demos) CGAL (Computational Geometry Algorithms Library) makes the most important of the solutions and methods developed in computational geometry available @@ -61,8 +61,10 @@ Description: C++ library for computational geometry (demos) This package contains the demos and examples. Package: libcgal-ipelets +Section: graphics Architecture: any -Depends: libcgal8 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} +Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+), + ${shlibs:Depends}, ${misc:Depends} Conflicts: libcgal5-ipelets Replaces: libcgal5-ipelets Description: C++ library for computational geometry (ipelets) diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index 9fc477c69da..269a926c941 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -3,14 +3,10 @@ Thu, 29 Apr 2004 18:43:18 +0200. It was downloaded from http://www.cgal.org/download/index.html. -The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 -Joachim Reichel and is licensed under the LGPL license, -eihter version 3 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-3. - -The package is not in main, but in non-free since parts of it are licensed -under the QPL. This license is not DFSG-free, but it permits one to autobuild -the package and to redistribute it in the non-free archive. +The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, +2010, 2011, 2012 Joachim Reichel and is licensed +under the LGPL license, version 2.1 or later (at your option), which can +be found in /usr/share/common-licenses/LGPL-2.1. @@ -156,23 +152,24 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which - license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 3 of the License) - or the Q Public License (version 1.0), *depending on each file*. The texts - of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. + license applies to it. This is either the GNU General Public License + or the GNU Lesser General Public License (as published by the Free Software + Foundation; either version 3 of the License or (at your option) any later + version). The texts of both licenses can be found in the files LICENSE.GPL + and LICENSE.LGPL. Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is - licensed under the QPL (see LICENSE.QPL). + licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). + (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -190,10 +187,11 @@ The following copyright statement is taken from include/CGAL/config.h. The year numbers and the set of copyright holders (see list above) varies from file to file. - Copyright (c) 1997-2004 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + Copyright (c) 1997-2010 + Utrecht University (The Netherlands), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. This file is part of CGAL (www.cgal.org); you can redistribute it and/or @@ -209,7 +207,7 @@ file to file. -Copyright statement for QPL'd files +Copyright statement for GPL'd files =================================== The following copyright statement is taken from include/CGAL/Width_3.h. The @@ -219,9 +217,10 @@ file to file. Copyright (c) 1997-2000 ETH Zurich (Switzerland). All rights reserved. - This file is part of CGAL (www.cgal.org); you may redistribute it under - the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CGAL. + This file is part of CGAL (www.cgal.org). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -236,9 +235,9 @@ Copright statement for files under the FREE_USE license Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -264,6 +263,51 @@ distributed with CGAL: +Boost +===== + +The following files are modified versions originating from Boost: + + ./include/CGAL/internal/boost/mutable_heap.hpp + ./include/CGAL/internal/boost/array_binary_tree.hpp + ./include/CGAL/internal/boost/mutable_queue.hpp + Copyright 1997, 1998, 1999, 2000 University of Notre Dame. + + ./include/CGAL/internal/container_fwd_fixed.hpp + Copyright 2005-2008 Daniel James. + + ./include/CGAL/auto_link/auto_link.h + (C) Copyright John Maddock 2003. + +All of these files are distributed under the Boost Software License, +version 1.0. + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + + CORE ==== @@ -274,9 +318,10 @@ src/CGALCore and include/CGAL/CORE. Copyright (c) 1995-2004 Exact Computation Project All rights reserved. - This file is part of CORE (http://cs.nyu.edu/exact/core/); you may - redistribute it under the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CORE. + This file is part of CORE (http://cs.nyu.edu/exact/core/). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the @@ -315,8 +360,7 @@ OpenNL The following copyright statement applies to the OpenNL library in include/CGAL/OpenNL. - author: Bruno Levy, INRIA, project ALICE - website: http://www.loria.fr/~levy/software + Copyright (c) 2005-2008 Inria Loria (France). This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -327,116 +371,6 @@ include/CGAL/OpenNL. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-3. - If not, write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301, USA - - - -LICENSE.QPL -=========== - - THE Q PUBLIC LICENSE - version 1.0 - - Copyright (C) 1999-2000 Troll Tech AS, Norway. - Everyone is permitted to copy and - distribute this license document. - -The intent of this license is to establish freedom to share and change the -software regulated by this license under the open source model. - -This license applies to any software containing a notice placed by the -copyright holder saying that it may be distributed under the terms of -the Q Public License version 1.0. Such software is herein referred to as -the Software. This license covers modification and distribution of the -Software, use of third-party application programs based on the Software, -and development of free software which uses the Software. - - Granted Rights - -1. You are granted the non-exclusive rights set forth in this license - provided you agree to and comply with any and all conditions in this - license. Whole or partial distribution of the Software, or software - items that link with the Software, in any form signifies acceptance of - this license. - -2. You may copy and distribute the Software in unmodified form provided - that the entire package, including - but not restricted to - copyright, - trademark notices and disclaimers, as released by the initial developer - of the Software, is distributed. - -3. You may make modifications to the Software and distribute your - modifications, in a form that is separate from the Software, such as - patches. The following restrictions apply to modifications: - - a. Modifications must not alter or remove any copyright notices in - the Software. - - b. When modifications to the Software are released under this - license, a non-exclusive royalty-free right is granted to the - initial developer of the Software to distribute your modification - in future versions of the Software provided such versions remain - available under these terms in addition to any other license(s) of - the initial developer. - -4. You may distribute machine-executable forms of the Software or - machine-executable forms of modified versions of the Software, provided - that you meet these restrictions: - - a. You must include this license document in the distribution. - - b. You must ensure that all recipients of the machine-executable forms - are also able to receive the complete machine-readable source code - to the distributed Software, including all modifications, without - any charge beyond the costs of data transfer, and place prominent - notices in the distribution explaining this. - - c. You must ensure that all modifications included in the - machine-executable forms are available under the terms of this - license. - -5. You may use the original or modified versions of the Software to - compile, link and run application programs legally developed by you - or by others. - -6. You may develop application programs, reusable components and other - software items that link with the original or modified versions of the - Software. These items, when distributed, are subject to the following - requirements: - - a. You must ensure that all recipients of machine-executable forms of - these items are also able to receive and use the complete - machine-readable source code to the items without any charge - beyond the costs of data transfer. - - b. You must explicitly license all recipients of your items to use - and re-distribute original and modified versions of the items in - both machine-executable and source code forms. The recipients must - be able to do so without any charges whatsoever, and they must be - able to re-distribute to anyone they choose. - - - c. If the items are not available to the general public, and the - initial developer of the Software requests a copy of the items, - then you must supply one. - - Limitations of Liability - -In no event shall the initial developers or copyright holders be liable -for any damages whatsoever, including - but not restricted to - lost -revenue or profits or other direct, indirect, special, incidental or -consequential damages, even if they have been advised of the possibility -of such damages, except to the extent invariable law, if any, provides -otherwise. - - No Warranty - -The Software and this license document are provided AS IS with NO WARRANTY -OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. - Choice of Law - -This license is governed by the Laws of Norway. Disputes shall be settled -by Oslo City Court. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Maintenance/deb/squeeze/debian/libcgal-demo.install b/Maintenance/deb/squeeze/debian/libcgal-demo.install index b942c0b1210..8370a7dad2c 100644 --- a/Maintenance/deb/squeeze/debian/libcgal-demo.install +++ b/Maintenance/deb/squeeze/debian/libcgal-demo.install @@ -1,2 +1,2 @@ -usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal8 -usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal8 +usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal9 +usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal9 diff --git a/Maintenance/deb/squeeze/debian/libcgal8.install b/Maintenance/deb/squeeze/debian/libcgal8.install deleted file mode 100644 index f59a64a1671..00000000000 --- a/Maintenance/deb/squeeze/debian/libcgal8.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* usr/lib -usr/share/doc/cgal/changelog usr/share/doc/libcgal8 diff --git a/Maintenance/deb/squeeze/debian/libcgal8.shlibs b/Maintenance/deb/squeeze/debian/libcgal8.shlibs deleted file mode 100644 index 2ccec271602..00000000000 --- a/Maintenance/deb/squeeze/debian/libcgal8.shlibs +++ /dev/null @@ -1,4 +0,0 @@ -libCGAL 8 libcgal8 -libCGAL_Core 8 libcgal8 -libCGAL_ImageIO 8 libcgal8 -libCGAL_Qt4 8 libcgal8 diff --git a/Maintenance/deb/squeeze/debian/libcgal9.install b/Maintenance/deb/squeeze/debian/libcgal9.install new file mode 100644 index 00000000000..26d5c3fe99c --- /dev/null +++ b/Maintenance/deb/squeeze/debian/libcgal9.install @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* usr/lib +usr/share/doc/cgal/changelog usr/share/doc/libcgal9 diff --git a/Maintenance/deb/squeeze/debian/libcgal9.shlibs b/Maintenance/deb/squeeze/debian/libcgal9.shlibs new file mode 100644 index 00000000000..a313a97e930 --- /dev/null +++ b/Maintenance/deb/squeeze/debian/libcgal9.shlibs @@ -0,0 +1,4 @@ +libCGAL 9 libcgal9 +libCGAL_Core 9 libcgal9 +libCGAL_ImageIO 9 libcgal9 +libCGAL_Qt4 9 libcgal9 diff --git a/Maintenance/deb/squeeze/debian/patches/ipe-default-to-version-7.dpatch b/Maintenance/deb/squeeze/debian/patches/ipe-default-to-version-7.dpatch deleted file mode 100755 index 107a81c83bb..00000000000 --- a/Maintenance/deb/squeeze/debian/patches/ipe-default-to-version-7.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ipe-default-to-version-7.dpatch by Joachim Reichel -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change default for WITH_IPE_7 to ON. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cgal-3.6~beta1~/demo/CGAL_ipelets/CMakeLists.txt cgal-3.6~beta1/demo/CGAL_ipelets/CMakeLists.txt ---- cgal-3.6~beta1~/demo/CGAL_ipelets/CMakeLists.txt 2010-01-28 21:00:13.000000000 +0100 -+++ cgal-3.6~beta1/demo/CGAL_ipelets/CMakeLists.txt 2010-03-08 21:34:59.000000000 +0100 -@@ -6,7 +6,7 @@ - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY .build/ipelets) - - find_package(CGAL QUIET COMPONENTS Core ) --option( WITH_IPE_7 "Use the version 7 of Ipe" OFF ) -+option( WITH_IPE_7 "Use the version 7 of Ipe" ON ) - - if ( CGAL_FOUND ) - include( ${CGAL_USE_FILE} ) diff --git a/Maintenance/deb/squeeze/debian/patches/00list b/Maintenance/deb/squeeze/debian/patches/series similarity index 100% rename from Maintenance/deb/squeeze/debian/patches/00list rename to Maintenance/deb/squeeze/debian/patches/series diff --git a/Maintenance/deb/squeeze/debian/rules b/Maintenance/deb/squeeze/debian/rules index 6ad78108520..09da40e7bfa 100755 --- a/Maintenance/deb/squeeze/debian/rules +++ b/Maintenance/deb/squeeze/debian/rules @@ -1,24 +1,11 @@ #!/usr/bin/make -f -.NOTPARALLEL: - -# Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -g -endif +%: + dh $@ -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_BUILD_ARCH),alpha) - IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d -endif - -configure-stamp: patch-stamp - dh_testdir +override_dh_auto_configure: mkdir -p static cd static && QTDIR= cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ @@ -29,56 +16,33 @@ configure-stamp: patch-stamp -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF - touch configure-stamp - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: configure-stamp - dh_testdir - dh_prep - $(MAKE) -C static - $(MAKE) -C shared - mkdir -p shared/demo/CGAL_ipelets cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ - -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + +override_dh_auto_build: + $(MAKE) -C static + $(MAKE) -C shared $(MAKE) -C shared/demo/CGAL_ipelets +override_dh_auto_test: ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes1 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1 $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes2 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2 endif - touch build-stamp -clean: clean-patched unpatch -clean-patched: patch - dh_testdir - dh_testroot - $(MAKE) -C debian/tests clean - rm -fr shared static ipelets - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot -# dh_prep - dh_installdirs +override_dh_auto_clean: + dh_auto_clean + rm -fr shared static +override_dh_install: $(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install - - # see bug #643278 - # $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install - IPE_VERSION=`dpkg-query -W -f='$${Version}' libipe-dev | sed 's/-.*$$//'`; \ - mkdir -p debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets; \ - cp demo/CGAL_ipelets/lua/libCGAL_*.lua shared/demo/CGAL_ipelets/libCGAL_*.so \ - debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets + $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install mkdir -p debian/tmp/usr/share/cmake-2.8/Modules cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.8/Modules @@ -95,49 +59,21 @@ install: build dh_install --sourcedir=debian/tmp --list-missing - ln -s libcgal8 debian/libcgal-demo/usr/share/doc/libcgal-demo + mkdir -p debian/libcgal-demo/usr/share/doc + ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo mkdir -p debian/libcgal-dev/usr/share/doc - ln -s libcgal8 debian/libcgal-dev/usr/share/doc/libcgal-dev + ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev mkdir -p debian/libcgal-ipelets/usr/share/doc - ln -s libcgal8 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets + ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_installdocs: + dh_installdocs -plibcgal9 debian/copyright -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -plibcgal8 debian/copyright - dh_installchangelogs -plibcgal8 - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a -ldebian/libcgal8/usr/lib - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +override_dh_installchangelogs: + dh_installchangelogs -plibcgal9 -binary: binary-indep binary-arch +override_dh_shlibdeps: + dh_shlibdeps -a -ldebian/libcgal9/usr/lib -patch: patch-stamp -patch-stamp: - dpatch apply-all - touch patch-stamp - -unpatch: - dpatch deapply-all - rm -fr patch-stamp debian/patched - -.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch +override_dh_gencontrol: + dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'` diff --git a/Maintenance/deb/squeeze/debian/source/format b/Maintenance/deb/squeeze/debian/source/format index d3827e75a5c..163aaf8d82b 100644 --- a/Maintenance/deb/squeeze/debian/source/format +++ b/Maintenance/deb/squeeze/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/Maintenance/deb/wheezy/debian/README.source b/Maintenance/deb/wheezy/debian/README.source index d191338a4aa..662cd01c5da 100644 --- a/Maintenance/deb/wheezy/debian/README.source +++ b/Maintenance/deb/wheezy/debian/README.source @@ -1,7 +1,11 @@ -README.source -------------- +normalize-audio for Debian +-------------------------- -The package uses dpatch to manage patches to the original source. -See /usr/share/doc/dpatch/README.source.gz for details. +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and +applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + + -- Joachim Reichel Sun, 15 Jan 2012 14:38:04 +0100 - -- Joachim Reichel Mon, 28 Sep 2009 21:19:03 +0200 diff --git a/Maintenance/deb/wheezy/debian/changelog b/Maintenance/deb/wheezy/debian/changelog index b7b83875e45..68f1184f38f 100644 --- a/Maintenance/deb/wheezy/debian/changelog +++ b/Maintenance/deb/wheezy/debian/changelog @@ -1,4 +1,45 @@ -cgal (3.9-1~wheezy1) testing; urgency=low +cgal (4.0-1~wheezy1) testing; urgency=low + + * New upstream release. + * Move from non-free to main due to upstream license change from QPL + to GPL 3+ (and from LGPL 2.1 to LGPL 3+), updated debian/copyright + accordingly. + * Rename binary package libcgal8 to libcgal9 to reflect SONAME change. + * Update Standards-Version to 3.9.3 (no changes needed). + * Remove fix-ipe-version-detection.dpatch and + fix-qt-moc-parse-error.dpatch (fixed upstream). + * Removed libmagick++9-dev from Suggests: of libcgal-demo, because + that package does no longer exists. + + -- Joachim Reichel Mon, 12 Mar 2012 19:14:55 +0100 + +cgal (3.9-4) unstable; urgency=low + + * Rebuild against boost 1.48 (Closes: #659358). + * Add fix-qt-moc-parse-error.dpatch as workaround for + https://bugreports.qt-project.org/browse/QTBUG-22829. + + -- Joachim Reichel Fri, 10 Feb 2012 22:41:26 +0100 + +cgal (3.9-3) unstable; urgency=low + + * Fix FTBFS when building only architecture dependent packages caused + by recent transition to the new packaging format (Closes: #658191). + + -- Joachim Reichel Wed, 01 Feb 2012 00:07:03 +0100 + +cgal (3.9-2) unstable; urgency=low + + * Changed packaging format to "3.0 (quilt)". + * Add fix-ipe-version-detection.dpatch: upstream patch for bug #643278. + Remove workaround. + * Tighten Depends: of libcgal-ipelets on ipe (Closes: #657720). + * Move libcgal-ipelets to Section: graphics. + * Add libqt4-opengl-dev to Suggests: of libcgal-demo. + + -- Joachim Reichel Mon, 30 Jan 2012 19:04:18 +0100 + +cgal (3.9-1) unstable; urgency=low * New upstream release. * Rename binary package libcgal7 to libcgal8 to reflect SONAME change. diff --git a/Maintenance/deb/wheezy/debian/compat b/Maintenance/deb/wheezy/debian/compat index 7f8f011eb73..45a4fb75db8 100644 --- a/Maintenance/deb/wheezy/debian/compat +++ b/Maintenance/deb/wheezy/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/Maintenance/deb/wheezy/debian/control b/Maintenance/deb/wheezy/debian/control index 10afacf861c..96968eeb5c7 100644 --- a/Maintenance/deb/wheezy/debian/control +++ b/Maintenance/deb/wheezy/debian/control @@ -1,16 +1,16 @@ Source: cgal -Section: non-free/libs Priority: optional Maintainer: Joachim Reichel # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake -Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev, - libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, - libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev, + libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, + libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe +Standards-Version: 3.9.3 +Section: libs Homepage: http://www.cgal.org/ XS-Autobuild: yes -Package: libcgal8 +Package: libcgal9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C++ library for computational geometry @@ -31,9 +31,9 @@ Description: C++ library for computational geometry visualisation, and I/O, and other support facilities. Package: libcgal-dev -Section: non-free/libdevel +Section: libdevel Architecture: any -Depends: libcgal8 (= ${binary:Version}), libboost-dev, +Depends: libcgal9 (= ${binary:Version}), libboost-dev, libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} Description: C++ library for computational geometry (development files) @@ -45,13 +45,13 @@ Description: C++ library for computational geometry (development files) This package contains the header files and static libraries. Package: libcgal-demo -Section: non-free/devel +Section: devel Architecture: all -Depends: libcgal-dev (>= ${binary:Version}), libcgal8 (>= ${binary:Version}), - ${misc:Depends} +Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}), + ${misc:Depends} Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev, - libmagick++-dev | libmagick++9-dev, qt4-dev-tools + libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev Description: C++ library for computational geometry (demos) CGAL (Computational Geometry Algorithms Library) makes the most important of the solutions and methods developed in computational geometry available @@ -61,8 +61,10 @@ Description: C++ library for computational geometry (demos) This package contains the demos and examples. Package: libcgal-ipelets +Section: graphics Architecture: any -Depends: libcgal8 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} +Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+), + ${shlibs:Depends}, ${misc:Depends} Conflicts: libcgal5-ipelets Replaces: libcgal5-ipelets Description: C++ library for computational geometry (ipelets) diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index 3fabef4d23e..269a926c941 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -3,14 +3,10 @@ Thu, 29 Apr 2004 18:43:18 +0200. It was downloaded from http://www.cgal.org/download/index.html. -The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 -Joachim Reichel and is licensed under the LGPL license, -either version 3 or later (at your option), which can be found in -/usr/share/common-licenses/LGPL-3. - -The package is not in main, but in non-free since parts of it are licensed -under the QPL. This license is not DFSG-free, but it permits one to autobuild -the package and to redistribute it in the non-free archive. +The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, +2010, 2011, 2012 Joachim Reichel and is licensed +under the LGPL license, version 2.1 or later (at your option), which can +be found in /usr/share/common-licenses/LGPL-2.1. @@ -156,23 +152,24 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", and "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). It is specified in each file of the CGAL library which - license applies to it. This is either the GNU Lesser General Public License - (as published by the Free Software Foundation; version 3 of the License) - or the Q Public License (version 1.0), *depending on each file*. The texts - of both licenses can be found in the files LICENSE.LGPL and LICENSE.QPL. + license applies to it. This is either the GNU General Public License + or the GNU Lesser General Public License (as published by the Free Software + Foundation; either version 3 of the License or (at your option) any later + version). The texts of both licenses can be found in the files LICENSE.GPL + and LICENSE.LGPL. Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is - licensed under the QPL (see LICENSE.QPL). + licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). + (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -190,15 +187,16 @@ The following copyright statement is taken from include/CGAL/config.h. The year numbers and the set of copyright holders (see list above) varies from file to file. - Copyright (c) 1997-2004 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + Copyright (c) 1997-2010 + Utrecht University (The Netherlands), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 3 of the License. + published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in @@ -209,7 +207,7 @@ file to file. -Copyright statement for QPL'd files +Copyright statement for GPL'd files =================================== The following copyright statement is taken from include/CGAL/Width_3.h. The @@ -219,9 +217,10 @@ file to file. Copyright (c) 1997-2000 ETH Zurich (Switzerland). All rights reserved. - This file is part of CGAL (www.cgal.org); you may redistribute it under - the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CGAL. + This file is part of CGAL (www.cgal.org). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. @@ -236,9 +235,9 @@ Copright statement for files under the FREE_USE license Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007 Utrecht University (The Netherlands), - ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), - INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg - (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + ETH Zurich (Switzerland), + INRIA Sophia-Antipolis (France), + Max-Planck-Institute Saarbruecken (Germany), and Tel-Aviv University (Israel). All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -264,6 +263,51 @@ distributed with CGAL: +Boost +===== + +The following files are modified versions originating from Boost: + + ./include/CGAL/internal/boost/mutable_heap.hpp + ./include/CGAL/internal/boost/array_binary_tree.hpp + ./include/CGAL/internal/boost/mutable_queue.hpp + Copyright 1997, 1998, 1999, 2000 University of Notre Dame. + + ./include/CGAL/internal/container_fwd_fixed.hpp + Copyright 2005-2008 Daniel James. + + ./include/CGAL/auto_link/auto_link.h + (C) Copyright John Maddock 2003. + +All of these files are distributed under the Boost Software License, +version 1.0. + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + + CORE ==== @@ -274,9 +318,10 @@ src/CGALCore and include/CGAL/CORE. Copyright (c) 1995-2004 Exact Computation Project All rights reserved. - This file is part of CORE (http://cs.nyu.edu/exact/core/); you may - redistribute it under the terms of the Q Public License version 1.0. - See the file LICENSE.QPL distributed with CORE. + This file is part of CORE (http://cs.nyu.edu/exact/core/). + You can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software Foundation, + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the @@ -315,8 +360,7 @@ OpenNL The following copyright statement applies to the OpenNL library in include/CGAL/OpenNL. - author: Bruno Levy, INRIA, project ALICE - website: http://www.loria.fr/~levy/software + Copyright (c) 2005-2008 Inria Loria (France). This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -327,116 +371,6 @@ include/CGAL/OpenNL. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this library; see the file /usr/share/common-licenses/LGPL-3. - If not, write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301, USA - - - -LICENSE.QPL -=========== - - THE Q PUBLIC LICENSE - version 1.0 - - Copyright (C) 1999-2000 Troll Tech AS, Norway. - Everyone is permitted to copy and - distribute this license document. - -The intent of this license is to establish freedom to share and change the -software regulated by this license under the open source model. - -This license applies to any software containing a notice placed by the -copyright holder saying that it may be distributed under the terms of -the Q Public License version 1.0. Such software is herein referred to as -the Software. This license covers modification and distribution of the -Software, use of third-party application programs based on the Software, -and development of free software which uses the Software. - - Granted Rights - -1. You are granted the non-exclusive rights set forth in this license - provided you agree to and comply with any and all conditions in this - license. Whole or partial distribution of the Software, or software - items that link with the Software, in any form signifies acceptance of - this license. - -2. You may copy and distribute the Software in unmodified form provided - that the entire package, including - but not restricted to - copyright, - trademark notices and disclaimers, as released by the initial developer - of the Software, is distributed. - -3. You may make modifications to the Software and distribute your - modifications, in a form that is separate from the Software, such as - patches. The following restrictions apply to modifications: - - a. Modifications must not alter or remove any copyright notices in - the Software. - - b. When modifications to the Software are released under this - license, a non-exclusive royalty-free right is granted to the - initial developer of the Software to distribute your modification - in future versions of the Software provided such versions remain - available under these terms in addition to any other license(s) of - the initial developer. - -4. You may distribute machine-executable forms of the Software or - machine-executable forms of modified versions of the Software, provided - that you meet these restrictions: - - a. You must include this license document in the distribution. - - b. You must ensure that all recipients of the machine-executable forms - are also able to receive the complete machine-readable source code - to the distributed Software, including all modifications, without - any charge beyond the costs of data transfer, and place prominent - notices in the distribution explaining this. - - c. You must ensure that all modifications included in the - machine-executable forms are available under the terms of this - license. - -5. You may use the original or modified versions of the Software to - compile, link and run application programs legally developed by you - or by others. - -6. You may develop application programs, reusable components and other - software items that link with the original or modified versions of the - Software. These items, when distributed, are subject to the following - requirements: - - a. You must ensure that all recipients of machine-executable forms of - these items are also able to receive and use the complete - machine-readable source code to the items without any charge - beyond the costs of data transfer. - - b. You must explicitly license all recipients of your items to use - and re-distribute original and modified versions of the items in - both machine-executable and source code forms. The recipients must - be able to do so without any charges whatsoever, and they must be - able to re-distribute to anyone they choose. - - - c. If the items are not available to the general public, and the - initial developer of the Software requests a copy of the items, - then you must supply one. - - Limitations of Liability - -In no event shall the initial developers or copyright holders be liable -for any damages whatsoever, including - but not restricted to - lost -revenue or profits or other direct, indirect, special, incidental or -consequential damages, even if they have been advised of the possibility -of such damages, except to the extent invariable law, if any, provides -otherwise. - - No Warranty - -The Software and this license document are provided AS IS with NO WARRANTY -OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. - Choice of Law - -This license is governed by the Laws of Norway. Disputes shall be settled -by Oslo City Court. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Maintenance/deb/wheezy/debian/libcgal-demo.install b/Maintenance/deb/wheezy/debian/libcgal-demo.install index b942c0b1210..8370a7dad2c 100644 --- a/Maintenance/deb/wheezy/debian/libcgal-demo.install +++ b/Maintenance/deb/wheezy/debian/libcgal-demo.install @@ -1,2 +1,2 @@ -usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal8 -usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal8 +usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal9 +usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal9 diff --git a/Maintenance/deb/wheezy/debian/libcgal8.install b/Maintenance/deb/wheezy/debian/libcgal8.install deleted file mode 100644 index f59a64a1671..00000000000 --- a/Maintenance/deb/wheezy/debian/libcgal8.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* usr/lib -usr/share/doc/cgal/changelog usr/share/doc/libcgal8 diff --git a/Maintenance/deb/wheezy/debian/libcgal8.shlibs b/Maintenance/deb/wheezy/debian/libcgal8.shlibs deleted file mode 100644 index 2ccec271602..00000000000 --- a/Maintenance/deb/wheezy/debian/libcgal8.shlibs +++ /dev/null @@ -1,4 +0,0 @@ -libCGAL 8 libcgal8 -libCGAL_Core 8 libcgal8 -libCGAL_ImageIO 8 libcgal8 -libCGAL_Qt4 8 libcgal8 diff --git a/Maintenance/deb/wheezy/debian/libcgal9.install b/Maintenance/deb/wheezy/debian/libcgal9.install new file mode 100644 index 00000000000..26d5c3fe99c --- /dev/null +++ b/Maintenance/deb/wheezy/debian/libcgal9.install @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* usr/lib +usr/share/doc/cgal/changelog usr/share/doc/libcgal9 diff --git a/Maintenance/deb/wheezy/debian/libcgal9.shlibs b/Maintenance/deb/wheezy/debian/libcgal9.shlibs new file mode 100644 index 00000000000..a313a97e930 --- /dev/null +++ b/Maintenance/deb/wheezy/debian/libcgal9.shlibs @@ -0,0 +1,4 @@ +libCGAL 9 libcgal9 +libCGAL_Core 9 libcgal9 +libCGAL_ImageIO 9 libcgal9 +libCGAL_Qt4 9 libcgal9 diff --git a/Maintenance/deb/wheezy/debian/patches/00list b/Maintenance/deb/wheezy/debian/patches/series similarity index 100% rename from Maintenance/deb/wheezy/debian/patches/00list rename to Maintenance/deb/wheezy/debian/patches/series diff --git a/Maintenance/deb/wheezy/debian/rules b/Maintenance/deb/wheezy/debian/rules index 6ad78108520..09da40e7bfa 100755 --- a/Maintenance/deb/wheezy/debian/rules +++ b/Maintenance/deb/wheezy/debian/rules @@ -1,24 +1,11 @@ #!/usr/bin/make -f -.NOTPARALLEL: - -# Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -g -endif +%: + dh $@ -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_BUILD_ARCH),alpha) - IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d -endif - -configure-stamp: patch-stamp - dh_testdir +override_dh_auto_configure: mkdir -p static cd static && QTDIR= cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ @@ -29,56 +16,33 @@ configure-stamp: patch-stamp -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF - touch configure-stamp - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: configure-stamp - dh_testdir - dh_prep - $(MAKE) -C static - $(MAKE) -C shared - mkdir -p shared/demo/CGAL_ipelets cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \ - -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared + +override_dh_auto_build: + $(MAKE) -C static + $(MAKE) -C shared $(MAKE) -C shared/demo/CGAL_ipelets +override_dh_auto_test: ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes1 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1 $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes2 LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2 endif - touch build-stamp -clean: clean-patched unpatch -clean-patched: patch - dh_testdir - dh_testroot - $(MAKE) -C debian/tests clean - rm -fr shared static ipelets - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot -# dh_prep - dh_installdirs +override_dh_auto_clean: + dh_auto_clean + rm -fr shared static +override_dh_install: $(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install - - # see bug #643278 - # $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install - IPE_VERSION=`dpkg-query -W -f='$${Version}' libipe-dev | sed 's/-.*$$//'`; \ - mkdir -p debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets; \ - cp demo/CGAL_ipelets/lua/libCGAL_*.lua shared/demo/CGAL_ipelets/libCGAL_*.so \ - debian/tmp/usr/lib/ipe/$$IPE_VERSION/ipelets + $(MAKE) -C shared/demo/CGAL_ipelets DESTDIR=$(CURDIR)/debian/tmp install mkdir -p debian/tmp/usr/share/cmake-2.8/Modules cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.8/Modules @@ -95,49 +59,21 @@ install: build dh_install --sourcedir=debian/tmp --list-missing - ln -s libcgal8 debian/libcgal-demo/usr/share/doc/libcgal-demo + mkdir -p debian/libcgal-demo/usr/share/doc + ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo mkdir -p debian/libcgal-dev/usr/share/doc - ln -s libcgal8 debian/libcgal-dev/usr/share/doc/libcgal-dev + ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev mkdir -p debian/libcgal-ipelets/usr/share/doc - ln -s libcgal8 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets + ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_installdocs: + dh_installdocs -plibcgal9 debian/copyright -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -plibcgal8 debian/copyright - dh_installchangelogs -plibcgal8 - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a -ldebian/libcgal8/usr/lib - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +override_dh_installchangelogs: + dh_installchangelogs -plibcgal9 -binary: binary-indep binary-arch +override_dh_shlibdeps: + dh_shlibdeps -a -ldebian/libcgal9/usr/lib -patch: patch-stamp -patch-stamp: - dpatch apply-all - touch patch-stamp - -unpatch: - dpatch deapply-all - rm -fr patch-stamp debian/patched - -.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch +override_dh_gencontrol: + dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'` diff --git a/Maintenance/deb/wheezy/debian/source/format b/Maintenance/deb/wheezy/debian/source/format index d3827e75a5c..163aaf8d82b 100644 --- a/Maintenance/deb/wheezy/debian/source/format +++ b/Maintenance/deb/wheezy/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) From a614260127f4614c330ce715f6a7129cbe240589 Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Mon, 12 Mar 2012 20:03:01 +0000 Subject: [PATCH 019/102] improve tagging commands, fix FTP server instructions --- Maintenance/deb/README | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Maintenance/deb/README b/Maintenance/deb/README index 89d98c73268..a6c92ea89ee 100644 --- a/Maintenance/deb/README +++ b/Maintenance/deb/README @@ -21,14 +21,14 @@ backport for squeeze: Tags ---- -svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 +svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -m "Tag for revision 4.0-1" +svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -m "Tag for revision 4.0-1~wheezy1" +svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 -m "Tag for revision 4.0-1~squeeze1" or: -svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -m "Tag for revision 4.0-1" +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -m "Tag for revision 4.0-1~wheezy1" +svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 -m "Tag for revision 4.0-1~squeeze1" FTP server @@ -37,7 +37,7 @@ FTP server wget http://www.joachim-reichel.de/tmp/cgal-4.0.tar.bz2 su cgal cd /ftp/pub/outgoing/CGAL/debian -mv pool/non-free/c/cgal/* archive +mv pool/main/c/cgal/* archive rm -fr dists pool tar xjf /path/to/downloaded/tarball # There should be 3 subdirectories "archive", "dists", and "pool" now. From dcf87863bb5408be10dfc8640b4dfca7dcfca618 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 14 Mar 2012 13:23:35 +0000 Subject: [PATCH 020/102] Our pre-commit hook is a bash script: use [[ ]] --- Maintenance/svn_server/hooks/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/svn_server/hooks/pre-commit b/Maintenance/svn_server/hooks/pre-commit index 23194a071f6..ec1cfe2184d 100755 --- a/Maintenance/svn_server/hooks/pre-commit +++ b/Maintenance/svn_server/hooks/pre-commit @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # PRE-COMMIT HOOK # From 4f9be31791a9335dae10d3eb6c5b25fcd8aafc71 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 16 Mar 2012 13:12:03 +0000 Subject: [PATCH 021/102] Add a note about Reply-To: --- Maintenance/public_release/announcement/where_to_announce | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Maintenance/public_release/announcement/where_to_announce b/Maintenance/public_release/announcement/where_to_announce index a8ffe204504..8e6f0da5932 100644 --- a/Maintenance/public_release/announcement/where_to_announce +++ b/Maintenance/public_release/announcement/where_to_announce @@ -15,6 +15,11 @@ And only for feature releases (not bug-fixes): mesh@sandia.gov communaute@medicis.polytechnique.fr +Note: add a Reply-To: cgal-discuss@lists-sop.inria.fr, to avoid cross-post +replies. + + + Newsgroups: sci.image.processing, From 02acd80611f67f1f84a5afa553d2f009e68d0783 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 19 Mar 2012 14:11:45 +0000 Subject: [PATCH 022/102] Better test and bench for do_intersect(BBox_3, Ray_3|Segment_3) --- .../bbox_other_do_intersect_test.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp index ba3c575e73a..936afd1b6ed 100644 --- a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp +++ b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp @@ -99,20 +99,24 @@ void speed(const std::string& name) CGAL::Timer timer; timer.start(); + std::size_t success = 0; while ( timer.time() < 0.1 ) { for ( typename std::vector::iterator it = segment_vector.begin(); it != segment_vector.end() ; ++it ) { - do_intersect(bbox_small, *it); + success += do_intersect(bbox_small, *it); } ++nb_loops; } timer.stop(); + std::cout << std::fixed << std::setprecision(1); std::cout << "\tDo_intersect(bbox, " << name << "): " << (nb_loops*segment_vector.size()) / (timer.time()*1000) - << " computations / ms " << std::endl; + << " computations / ms " + << (success / ((0.+ nb_loops*segment_vector.size()) / 100)) + << "% of intersection" << std::endl; } template @@ -336,6 +340,10 @@ int main() b &= test >(); test_speed >(); + std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; + b &= test >(); + test_speed >(); + std::cout << std::endl << "Testing with Cartesian..." << std::endl ; b &= test >(); test_speed >(); @@ -344,6 +352,11 @@ int main() b &= test >(); test_speed >(); + std::cout << std::endl << "Testing with Filtered_kernel > without static filters..." << std::endl ; + typedef CGAL::Filtered_kernel, false> Fk_no_static; + b &= test(); + test_speed(); + std::cout << std::endl << "Testing with Exact_predicates_inexact_constructions_kernel..." << std::endl ; b &= test(); test_speed(); From a429b26316502a97c80ea6c8a0b552e31f936fe3 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 19 Mar 2012 14:26:17 +0000 Subject: [PATCH 023/102] Cherry-pick that revision from /branches/features/Mesh_3-parallel-cjamin/ | ------------------------------------------------------------------------ | r68020 | cjamin | 2012-03-12 18:27:30 +0100 (Mon, 12 Mar 2012) | 1 line | | To be able to build CGAL on MSVC11 | ------------------------------------------------------------------------ It adapts CGAL CMake scripts and CGAL auto-link headers to MSVC2011. Thanks to Clement Jamin, from Inria, for the patch. --- .../cmake/modules/CGAL_GeneratorSpecificSettings.cmake | 5 ++++- Installation/cmake/modules/FindBoost.cmake | 4 +++- Installation/include/CGAL/auto_link/auto_link.h | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake index 1c859fc9f1e..2fa0169d5b9 100644 --- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake +++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake @@ -8,7 +8,10 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED ) set(CGAL_AUTO_LINK_ENABLED TRUE) endif() - if ( MSVC10 ) + if ( MSVC11 ) + set(CGAL_TOOLSET "vc110") + message( STATUS "Using VC11 compiler." ) + elseif ( MSVC10 ) set(CGAL_TOOLSET "vc100") message( STATUS "Using VC10 compiler." ) elseif ( MSVC90 ) diff --git a/Installation/cmake/modules/FindBoost.cmake b/Installation/cmake/modules/FindBoost.cmake index fbdde88c8ab..7ae9e373ca0 100644 --- a/Installation/cmake/modules/FindBoost.cmake +++ b/Installation/cmake/modules/FindBoost.cmake @@ -566,7 +566,9 @@ ELSE (_boost_IN_CACHE) # NOTE: this is not perfect yet, if you experience any issues # please report them and use the Boost_COMPILER variable # to work around the problems. - if (MSVC10) + if (MSVC11) + SET (_boost_COMPILER "-vc110") + elseif (MSVC10) SET (_boost_COMPILER "-vc100") elseif (MSVC90) SET (_boost_COMPILER "-vc90") diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h index bf9d33889e9..cb98f6a38e7 100644 --- a/Installation/include/CGAL/auto_link/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -155,11 +155,16 @@ CGAL_VERSION: Defined in // vc90: # define CGAL_LIB_TOOLSET "vc90" -#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600) +#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600) // vc10: # define CGAL_LIB_TOOLSET "vc100" +#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700) + + // vc11: +# define CGAL_LIB_TOOLSET "vc110" + #elif defined(__BORLANDC__) // CBuilder 6: From af10650852289716a0b4ab2400976247012b3b25 Mon Sep 17 00:00:00 2001 From: Eric Berberich Date: Tue, 20 Mar 2012 13:09:04 +0000 Subject: [PATCH 024/102] make functions inline in order to work with multiple compile objects avoids linking error "duplicate symbols" --- Algebraic_kernel_d/include/CGAL/RS/compare_1.h | 1 + Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Algebraic_kernel_d/include/CGAL/RS/compare_1.h b/Algebraic_kernel_d/include/CGAL/RS/compare_1.h index c1242579803..dc9a4d97bca 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/compare_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/compare_1.h @@ -36,6 +36,7 @@ namespace RS_COMPARE{ // compare two algebraic numbers, knowing they are not equal //template +inline Comparison_result compare_1_unequal(const Algebraic_1 &r1,const Algebraic_1 &r2){ /*typedef _Gcd_policy Gcd; diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h index baa659d6f40..ad51fba722d 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_io.h @@ -65,6 +65,7 @@ std::ostream& operator<<(std::ostream &os,const RS_polynomial_1 &p){ } } +inline std::istream& operator>>(std::istream &is,RS_polynomial_1 &pol){ std::istream::int_type c; std::ios::fmtflags old_flags=is.flags(); From e6008e473116211bcb74869e890d1cb79877a0a5 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Wed, 21 Mar 2012 22:14:40 +0000 Subject: [PATCH 025/102] added missing inline --- .../include/CGAL/Arr_circular_line_arc_traits_2.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h index 2886b0c42be..25666fc86bc 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h @@ -508,7 +508,8 @@ namespace CGAL { // in Arr_circular_line_arc_traits_2. namespace internal_Argt_traits{ struct Not_X_Monotone{}; - std::ostream& operator<<(std::ostream& os,const Not_X_Monotone&) {return os;} + inline std::ostream& operator << (std::ostream& os, const Not_X_Monotone&) + {return os;} } /// Traits class for CGAL::Arrangement_2 (and similar) based on a CircularKernel. From ecf6aa105a08992b34be2aa540b4c0e33366e98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 23 Mar 2012 16:29:54 +0000 Subject: [PATCH 026/102] correct wrong typedef --- Polyhedron/include/CGAL/Polyhedron_copy_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polyhedron/include/CGAL/Polyhedron_copy_3.h b/Polyhedron/include/CGAL/Polyhedron_copy_3.h index 4517dddb96b..3bbb505fc6a 100644 --- a/Polyhedron/include/CGAL/Polyhedron_copy_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_copy_3.h @@ -49,7 +49,7 @@ Polyhedron_copy_3:: operator()( HDS& target) { typedef typename Poly::Vertex_const_iterator Vertex_const_iterator; typedef typename Poly::Facet_const_iterator Facet_const_iterator; typedef Inverse_index< Vertex_const_iterator> Index; - typedef typename HDS::Point Point; + typedef typename HDS::Vertex::Point Point; target.clear(); Polyhedron_incremental_builder_3 B( target); From 042482d9861ecf80025a630641f922a5a001dbd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Fri, 23 Mar 2012 17:25:52 +0000 Subject: [PATCH 027/102] Removed unused Identity_iterator Identity_iterator was neither documented nor used anywhere throughout the code base and served no real purpose and can easier be implemented (if really needed) with iterator_adaptor or the iterator helpers in boost operators. --- .../include/CGAL/Iterator_identity.h | 147 --- .../test/STL_Extension/test_stl_extension.cpp | 893 ------------------ 2 files changed, 1040 deletions(-) delete mode 100644 STL_Extension/include/CGAL/Iterator_identity.h diff --git a/STL_Extension/include/CGAL/Iterator_identity.h b/STL_Extension/include/CGAL/Iterator_identity.h deleted file mode 100644 index d61ba45fb65..00000000000 --- a/STL_Extension/include/CGAL/Iterator_identity.h +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright (c) 2003 -// Utrecht University (The Netherlands), -// ETH Zurich (Switzerland), -// INRIA Sophia-Antipolis (France), -// Max-Planck-Institute Saarbruecken (Germany), -// and Tel-Aviv University (Israel). All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// 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) : Michael Hoffmann -// Lutz Kettner -// Sylvain Pion - -#ifndef CGAL_ITERATOR_IDENTITY_H -#define CGAL_ITERATOR_IDENTITY_H 1 - -#include - -namespace CGAL { - -template < class I, - class Ref = typename std::iterator_traits::reference, - class Ptr = typename std::iterator_traits::pointer, - class Val = typename std::iterator_traits::value_type, - class Dist = typename std::iterator_traits::difference_type, - class Ctg = typename std::iterator_traits::iterator_category> -class Iterator_identity { -protected: - I nt; // The internal iterator. -public: - typedef I Iterator; - typedef Iterator_identity Self; - typedef Ctg iterator_category; - typedef Val value_type; - typedef Dist difference_type; - typedef Ref reference; - typedef Ptr pointer; - - // CREATION - // -------- - - Iterator_identity() {} - Iterator_identity( Iterator j) : nt(j) {} - - // OPERATIONS Forward Category - // --------------------------- - - Iterator current_iterator() const { return nt;} - - bool operator==( const Self& i) const { - return ( nt == i.nt); //###// - } - bool operator!=( const Self& i) const { - return !(*this == i); - } - Ref operator*() const { - return *nt; //###// - } - Ptr operator->() const { - return nt.operator->(); //###// - } - Self& operator++() { - ++nt; //###// - return *this; - } - Self operator++(int) { - Self tmp = *this; - ++*this; - return tmp; - } - - // OPERATIONS Bidirectional Category - // --------------------------------- - - Self& operator--() { - --nt; //###// - return *this; - } - Self operator--(int) { - Self tmp = *this; - --*this; - return tmp; - } - - // OPERATIONS Random Access Category - // --------------------------------- - - Self& operator+=( difference_type n) { - nt += n; //###// - return *this; - } - Self operator+( difference_type n) const { - Self tmp = *this; - return tmp += n; - } - Self& operator-=( difference_type n) { - return operator+=( -n); - } - Self operator-( difference_type n) const { - Self tmp = *this; - return tmp += -n; - } - difference_type operator-( const Self& i) const { - return nt - i.nt; //###// - } - Ref operator[]( difference_type n) const { - Self tmp = *this; - tmp += n; - return tmp.operator*(); - } - bool operator<( const Self& i) const { - return ( nt < i.nt); //###// - } - bool operator>( const Self& i) const { - return i < *this; - } - bool operator<=( const Self& i) const { - return !(i < *this); - } - bool operator>=( const Self& i) const { - return !(*this < i); - } -}; - -template < class I, class Ref, class Ptr, class Val, - class Dist, class Ctg> -inline -Iterator_identity -operator+( Dist n, Iterator_identity i) -{ return i += n; } - -} //namespace CGAL -#endif // CGAL_ITERATOR_IDENTITY_H // -// EOF // diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index 7b71656c6d6..d81c78068db 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -237,897 +236,6 @@ int test_value_type( double*) { return 3;} int test_distance_type( std::ptrdiff_t*) { return 1;} int test_distance_type( char*) { return 2;} int test_distance_type( double*) { return 3;} -void test_Iterator_identity() { - { - typedef In_place_list List; - List l; - l.push_back( *new item(1)); - l.push_back( *new item(2)); - l.push_back( *new item(3)); - l.push_back( *new item(4)); - l.push_back( *new item(5)); - CGAL_assertion( l.size() == 5); - typedef List::iterator IterBase; - typedef Iterator_identity Iterator; - Iterator begin(l.begin()); - Iterator end(l.end()); - Assert_bidirectional_category(begin); - Assert_bidirectional_category(end); - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(begin); - CGAL::Assert_circulator_or_iterator(end); - CGAL::Assert_is_at_least_forward_category(begin); - CGAL::Assert_is_at_least_forward_category(end); - typedef std::iterator_traits< Iterator >::value_type VT; - typedef std::iterator_traits< Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = end ; - - // Copy constructor. - Iterator i = begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( z, z)); - CGAL_assertion( ! CGAL::is_empty_range( i, end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != end) { - CGAL_assertion( (*i).key == (*j).key); - } - } while (i != end); // Inequality and equality checked. - } - CGAL_assertion( i == end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != end) { - CGAL_assertion( (*i).key == (*j).key + 1); - } - } while (i != end); - } - CGAL_assertion( i == end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - // Change three elements and check post-/pre-increment. - Iterator i = begin; - (*i++).key = 4; - CGAL_assertion( 4 == (*begin).key); - CGAL_assertion( 2 == (*i).key); - (*i++).key = 3; - CGAL_assertion( 3 == (*i).key); - (*++i).key = 7; - CGAL_assertion( 7 == (*i).key); - - // Check the setting and reset these elements - // to their original values. - i = begin; - CGAL_assertion( 4 == (*i).key); - (*i).key = 1; - i++; - CGAL_assertion( 3 == (*i).key); - (*i++).key = 2; - CGAL_assertion( 3 == (*i).key); - i++; - CGAL_assertion( 7 == (*i).key); - (*i).key = 4; - - // Check the resetting. - i = begin; - int k = 1; - do { - CGAL_assertion( k == (*i).key); - ++i; - ++k; - } while (i != end); - } - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(begin); - CGAL::Assert_circulator_or_iterator(end); - CGAL::Assert_is_at_least_forward_category(begin); - CGAL::Assert_is_at_least_forward_category(end); - typedef std::iterator_traits< Iterator >::value_type VT; - typedef std::iterator_traits< Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = end ; - // Copy constructor. - Iterator i = begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( z, z)); - CGAL_assertion( ! CGAL::is_empty_range( i, end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != end) { - CGAL_assertion( (*i).key == (*j).key); - } - } while (i != end); // Inequality and equality checked. - } - CGAL_assertion( i == end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != end) { - CGAL_assertion( (*i).key == (*j).key + 1); - } - } while (i != end); - } - CGAL_assertion( i == end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_bidirectional_category(begin); - CGAL::Assert_is_at_least_bidirectional_category(end); - // Loop backwards and pre-decrement. - Iterator i = end; - int su = 0; - int k = 5; - do { - CGAL_assertion_code(Iterator j =) --i; - CGAL_assertion( i == j); - CGAL_assertion( (*i).key == (*j).key); - CGAL_assertion( k == (*i).key); - su += (*i).key; - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - - // Assignment. - i = end; - su = 0; - k = 5; - // Loop with post-decrement. - do { - Iterator j = i--; - CGAL_assertion( i != j); - if ( j != end) { - CGAL_assertion( (*i).key == (*j).key - 1); - } - CGAL_assertion( k == (*i).key); - su += (*i).key; - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - } - CGAL::Assert_iterator( begin); - CGAL::Assert_iterator( end); - - List l2 = l; - const List& l1 = l2; - typedef List::const_iterator ConstIterBase; - typedef Iterator_identity< ConstIterBase,const item&, - const item*, item, std::ptrdiff_t, - std::bidirectional_iterator_tag> - C_Iterator; - C_Iterator c_begin(l1.begin()); - C_Iterator c_end(l1.end()); - Assert_bidirectional_category(c_begin); - Assert_bidirectional_category(c_end); - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(c_begin); - CGAL::Assert_circulator_or_iterator(c_end); - CGAL::Assert_is_at_least_forward_category(c_begin); - CGAL::Assert_is_at_least_forward_category(c_end); - typedef std::iterator_traits< C_Iterator >::value_type VT; - typedef std::iterator_traits< C_Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - C_Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = c_end ; - // Copy constructor. - C_Iterator i = c_begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( z, z)); - CGAL_assertion( ! CGAL::is_empty_range( i, c_end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, c_end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( C_Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != c_end) { - CGAL_assertion( (*i).key == (*j).key); - } - } while (i != c_end); // Inequality and equality checked. - } - CGAL_assertion( i == c_end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = c_begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, c_end)) { // superfluous - do { - CGAL_assertion( k == (*i).key); - su += (*i).key; - ++k; - CGAL_assertion_code( C_Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != c_end) { - CGAL_assertion( (*i).key == (*j).key + 1); - } - } while (i != c_end); - } - CGAL_assertion( i == c_end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_bidirectional_category(c_begin); - CGAL::Assert_is_at_least_bidirectional_category(c_end); - // Loop backwards and pre-decrement. - C_Iterator i = c_end; - int su = 0; - int k = 5; - do { - CGAL_assertion_code(C_Iterator j =) --i; - CGAL_assertion( i == j); - CGAL_assertion( (*i).key == (*j).key); - CGAL_assertion( k == (*i).key); - su += (*i).key; - --k; - } while (i != c_begin); - CGAL_assertion( i == c_begin); - CGAL_assertion( su == 15); - - // Assignment. - i = c_end; - su = 0; - k = 5; - // Loop with post-decrement. - do { - C_Iterator j = i--; - CGAL_assertion( i != j); - if ( j != c_end) { - CGAL_assertion( (*i).key == (*j).key - 1); - } - CGAL_assertion( k == (*i).key); - su += (*i).key; - --k; - } while (i != c_begin); - CGAL_assertion( i == c_begin); - CGAL_assertion( su == 15); - } - CGAL::Assert_iterator( c_begin); - CGAL::Assert_iterator( c_end); - l.destroy(); - l2.destroy(); - } - { - typedef std::vector Vector; - Vector v; - v.push_back(1); - v.push_back(2); - v.push_back(3); - v.push_back(4); - v.push_back(5); - CGAL_assertion( v.size() == 5); - typedef Vector::iterator IterBase; - typedef Iterator_identity Iterator; - Iterator begin(v.begin()); - Iterator end(v.end()); - Assert_random_access_category(begin); - Assert_random_access_category(end); - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(begin); - CGAL::Assert_circulator_or_iterator(end); - CGAL::Assert_is_at_least_forward_category(begin); - CGAL::Assert_is_at_least_forward_category(end); - typedef std::iterator_traits< Iterator >::value_type VT; - typedef std::iterator_traits< Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = end ; - // Copy constructor. - Iterator i = begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( i, i)); - CGAL_assertion( ! CGAL::is_empty_range( i, end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != end) { - CGAL_assertion( (*i) == (*j)); - } - } while (i != end); // Inequality and equality checked. - } - CGAL_assertion( i == end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != end) { - CGAL_assertion( (*i) == (*j) + 1); - } - } while (i != end); - } - CGAL_assertion( i == end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - // Change three elements and check post-/pre-increment. - Iterator i = begin; - (*i++) = 4; - CGAL_assertion( 4 == (*begin)); - CGAL_assertion( 2 == (*i)); - (*i++) = 3; - CGAL_assertion( 3 == (*i)); - (*++i) = 7; - CGAL_assertion( 7 == (*i)); - - // Check the setting and reset these elements - // to their original values. - i = begin; - CGAL_assertion( 4 == (*i)); - (*i) = 1; - i++; - CGAL_assertion( 3 == (*i)); - (*i++) = 2; - CGAL_assertion( 3 == (*i)); - i++; - CGAL_assertion( 7 == (*i)); - (*i) = 4; - - // Check the resetting. - i = begin; - int k = 1; - do { - CGAL_assertion( k == (*i)); - ++i; - ++k; - } while (i != end); - } - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(begin); - CGAL::Assert_circulator_or_iterator(end); - CGAL::Assert_is_at_least_forward_category(begin); - CGAL::Assert_is_at_least_forward_category(end); - typedef std::iterator_traits< Iterator >::value_type VT; - typedef std::iterator_traits< Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = end ; - // Copy constructor. - Iterator i = begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( i, i)); - CGAL_assertion( ! CGAL::is_empty_range( i, end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != end) { - CGAL_assertion( (*i) == (*j)); - } - } while (i != end); // Inequality and equality checked. - } - CGAL_assertion( i == end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != end) { - CGAL_assertion( (*i) == (*j) + 1); - } - } while (i != end); - } - CGAL_assertion( i == end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_bidirectional_category(begin); - CGAL::Assert_is_at_least_bidirectional_category(end); - // Loop backwards and pre-decrement. - Iterator i = end; - int su = 0; - int k = 5; - do { - CGAL_assertion_code(Iterator j =) --i; - CGAL_assertion( i == j); - CGAL_assertion( (*i) == (*j)); - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - - // Assignment. - i = end; - su = 0; - k = 5; - // Loop with post-decrement. - do { - Iterator j = i--; - CGAL_assertion( i != j); - if ( j != end) { - CGAL_assertion( (*i) == (*j) - 1); - } - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(begin); - CGAL::Assert_circulator_or_iterator(end); - CGAL::Assert_is_at_least_forward_category(begin); - CGAL::Assert_is_at_least_forward_category(end); - typedef std::iterator_traits< Iterator >::value_type VT; - typedef std::iterator_traits< Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = end ; - // Copy constructor. - Iterator i = begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( i, i)); - CGAL_assertion( ! CGAL::is_empty_range( i, end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != end) { - CGAL_assertion( (*i) == (*j)); - } - } while (i != end); // Inequality and equality checked. - } - CGAL_assertion( i == end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != end) { - CGAL_assertion( (*i) == (*j) + 1); - } - } while (i != end); - } - CGAL_assertion( i == end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_bidirectional_category(begin); - CGAL::Assert_is_at_least_bidirectional_category(end); - // Loop backwards and pre-decrement. - Iterator i = end; - int su = 0; - int k = 5; - do { - CGAL_assertion_code(Iterator j =) --i; - CGAL_assertion( i == j); - CGAL_assertion( (*i) == (*j)); - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - - // Assignment. - i = end; - su = 0; - k = 5; - // Loop with post-decrement. - do { - Iterator j = i--; - CGAL_assertion( i != j); - if ( j != end) { - CGAL_assertion( (*i) == (*j) - 1); - } - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != begin); - CGAL_assertion( i == begin); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_random_access_category(begin); - CGAL::Assert_is_at_least_random_access_category(end); - // Random access. - int k; - for( k = 0; k < 5; k++) { - CGAL_assertion( 1+k == begin[k]); - } - CGAL_assertion_code( - int su = begin[0] - + begin[1] - + begin[2] - + begin[3] - + begin[4];) - CGAL_assertion( su == 15); - - // Jump around. - Iterator i = begin; - i += 3; - CGAL_assertion( 4 == (*i)); - i -= 2; - CGAL_assertion( 2 == (*i)); - i += 3; - CGAL_assertion( 5 == (*i)); - i -= 4; - CGAL_assertion( 1 == (*i)); - CGAL_assertion( i == begin); - Iterator j = i + 3; - CGAL_assertion( 4 == (*j)); - Iterator jj = j - 2; - CGAL_assertion( 2 == (*jj)); - typedef std::ptrdiff_t PT; - jj = PT(4) + jj; - CGAL_assertion( jj == end); - Iterator ij = jj - 5; - ij = jj - 5; // avoids warning with NDEBUG - CGAL_assertion( ij == begin); - - // Difference test. - CGAL_assertion( jj - i == 5 || jj - i == 0); - CGAL_assertion( i + (j-i) == j); - CGAL_assertion( (j-i) + i == j); - } - { // Open own scope to hide local variables. - Iterator i = begin; - i[2] = 18; - i[4] = 9; - i[3] = 12; - CGAL_assertion( i[2] == 18); - CGAL_assertion( i[4] == 9); - CGAL_assertion( i[3] == 12); - i[2] = 3; - i[3] = 4; - i[4] = 5; - // Check the resetting. - i = begin; - int k = 1; - do { - CGAL_assertion( k == (*i)); - ++i; - ++k; - } while (i != end); - } - CGAL::Assert_iterator( begin); - CGAL::Assert_iterator( end); - { // Open own scope to hide local variables. - CGAL_assertion( end - begin == 5); - CGAL_assertion( begin - end == -5); - // Relational operator. - Iterator i = begin; - ++i; - Iterator j = i; - ++j; - CGAL_assertion( begin < i); - CGAL_assertion( i < j); - CGAL_assertion( j < end); - CGAL_assertion( j > i); - CGAL_assertion( i <= j); - CGAL_assertion( j >= i); - CGAL_assertion( i <= i); - CGAL_assertion( i >= i); - - CGAL_assertion( !( i >= j)); - CGAL_assertion( !( j <= i)); - CGAL_assertion( !( i > j)); - CGAL_assertion( !( j < i)); - CGAL_assertion( !( i > i)); - CGAL_assertion( !( i < i)); - } - - Vector v2 = v; - const Vector& v1 = v2; - typedef Vector::const_iterator ConstIterBase; - typedef Iterator_identity< ConstIterBase,const int&, - const int*, int, std::ptrdiff_t, - std::random_access_iterator_tag> - C_Iterator; - C_Iterator c_begin(v1.begin()); - C_Iterator c_end(v1.end()); - Assert_random_access_category(c_begin); - Assert_random_access_category(c_end); - { // Open own scope to hide local variables. - // Check generally correct parameter properties. - CGAL::Assert_circulator_or_iterator(c_begin); - CGAL::Assert_circulator_or_iterator(c_end); - CGAL::Assert_is_at_least_forward_category(c_begin); - CGAL::Assert_is_at_least_forward_category(c_end); - typedef std::iterator_traits< C_Iterator >::value_type VT; - typedef std::iterator_traits< C_Iterator >::difference_type DT; - CGAL_assertion(1==test_value_type(static_cast< VT* >(0))); - CGAL_assertion(1==test_distance_type(static_cast< DT* >(0))); - - // Default constructor. - C_Iterator z ; - CGAL::Assert_circulator_or_iterator(z); - z = c_end ; - // Copy constructor. - C_Iterator i = c_begin; - - // Check general support for circulators and iterators. - CGAL_assertion( CGAL::is_empty_range( i, i)); - CGAL_assertion( ! CGAL::is_empty_range( i, c_end)); - - int su = 0; - int k = 1; - // Check general loop, pre-increment, dereference. - if (! CGAL::is_empty_range( i, c_end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( C_Iterator j =) ++i; - CGAL_assertion( i == j); - if ( i != c_end) { - CGAL_assertion( (*i) == (*j)); - } - } while (i != c_end); // Inequality and equality checked. - } - CGAL_assertion( i == c_end); // Equality checked. - CGAL_assertion( su == 15); - - // Assignment. - i = c_begin; - su = 0; - k = 1; - // Loop with post increment. - if (! CGAL::is_empty_range( i, c_end)) { // superfluous - do { - CGAL_assertion( k == (*i)); - su += (*i); - ++k; - CGAL_assertion_code( C_Iterator j =) i++; - CGAL_assertion( i != j); - if ( i != c_end) { - CGAL_assertion( (*i) == (*j) + 1); - } - } while (i != c_end); - } - CGAL_assertion( i == c_end); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_bidirectional_category(c_begin); - CGAL::Assert_is_at_least_bidirectional_category(c_end); - // Loop backwards and pre-decrement. - C_Iterator i = c_end; - int su = 0; - int k = 5; - do { - CGAL_assertion_code(C_Iterator j =) --i; - CGAL_assertion( i == j); - CGAL_assertion( (*i) == (*j)); - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != c_begin); - CGAL_assertion( i == c_begin); - CGAL_assertion( su == 15); - - // Assignment. - i = c_end; - su = 0; - k = 5; - // Loop with post-decrement. - do { - C_Iterator j = i--; - CGAL_assertion( i != j); - if ( j != c_end) { - CGAL_assertion( (*i) == (*j) - 1); - } - CGAL_assertion( k == (*i)); - su += (*i); - --k; - } while (i != c_begin); - CGAL_assertion( i == c_begin); - CGAL_assertion( su == 15); - } - { // Open own scope to hide local variables. - CGAL::Assert_is_at_least_random_access_category(c_begin); - CGAL::Assert_is_at_least_random_access_category(c_end); - // Random access. - int k; - for( k = 0; k < 5; k++) { - CGAL_assertion( 1+k == c_begin[k]); - } - CGAL_assertion_code( - int su = c_begin[0] - + c_begin[1] - + c_begin[2] - + c_begin[3] - + c_begin[4];) - CGAL_assertion( su == 15); - - // Jump around. - C_Iterator i = c_begin; - i += 3; - CGAL_assertion( 4 == (*i)); - i -= 2; - CGAL_assertion( 2 == (*i)); - i += 3; - CGAL_assertion( 5 == (*i)); - i -= 4; - CGAL_assertion( 1 == (*i)); - CGAL_assertion( i == c_begin); - C_Iterator j = i + 3; - CGAL_assertion( 4 == (*j)); - C_Iterator jj = j - 2; - CGAL_assertion( 2 == (*jj)); - typedef std::ptrdiff_t PT; - jj = PT(4) + jj; - CGAL_assertion( jj == c_end); - C_Iterator ij = jj - 5; - ij = jj - 5; // avoids warning with NDEBUG - CGAL_assertion( ij == c_begin); - - // Difference test. - CGAL_assertion( jj - i == 5 || jj - i == 0); - CGAL_assertion( i + (j-i) == j); - CGAL_assertion( (j-i) + i == j); - } - CGAL::Assert_iterator( c_begin); - CGAL::Assert_iterator( c_end); - { // Open own scope to hide local variables. - CGAL_assertion( c_end - c_begin == 5); - CGAL_assertion( c_begin - c_end == -5); - // Relational operator. - C_Iterator i = c_begin; - ++i; - C_Iterator j = i; - ++j; - CGAL_assertion( c_begin < i); - CGAL_assertion( i < j); - CGAL_assertion( j < c_end); - CGAL_assertion( j > i); - CGAL_assertion( i <= j); - CGAL_assertion( j >= i); - CGAL_assertion( i <= i); - CGAL_assertion( i >= i); - - CGAL_assertion( !( i >= j)); - CGAL_assertion( !( j <= i)); - CGAL_assertion( !( i > j)); - CGAL_assertion( !( j < i)); - CGAL_assertion( !( i > i)); - CGAL_assertion( !( i < i)); - } - } -} void test_Circulator_identity() { { typedef In_place_list List; @@ -9030,7 +8138,6 @@ void test_copy_n() { int main() { init_global_data(); - test_Iterator_identity(); test_Circulator_identity(); test_Iterator_project(); test_Iterator_transform(); From 15f43b4ecc363498c3d2f4ac4d1e71e32032703b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 26 Mar 2012 09:43:07 +0000 Subject: [PATCH 028/102] test that the cached include path is valid --- Installation/cmake/modules/FindEigen3.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Installation/cmake/modules/FindEigen3.cmake b/Installation/cmake/modules/FindEigen3.cmake index 20023c198a8..1f49d7284af 100644 --- a/Installation/cmake/modules/FindEigen3.cmake +++ b/Installation/cmake/modules/FindEigen3.cmake @@ -57,9 +57,17 @@ set(EIGEN3_USE_FILE "UseEigen3") if (EIGEN3_INCLUDE_DIR) - # in cache already - _eigen3_check_version() - set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) + if (EXISTS ${EIGEN3_INCLUDE_DIR}/signature_of_eigen3_matrix_library) + # in cache already and valid + _eigen3_check_version() + set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) + else() + message(STATUS "Eigen3 path specified in cmake variable EIGEN3_INCLUDE_DIR is " + "set to ${EIGEN3_INCLUDE_DIR}, but that path does not contains the file " + "signature_of_eigen3_matrix_library and is considered as invalid.") + endif() + + else (EIGEN3_INCLUDE_DIR) From bf1cdcf7a825d0063bf304cbe78ad09790d22792 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 26 Mar 2012 12:51:35 +0000 Subject: [PATCH 030/102] Add the special case for removal operation --- .../include/CGAL/Combinatorial_map_operations.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 21cb39a7dd7..3267ff9a165 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -282,7 +282,8 @@ namespace CGAL { { if ( !d1->is_free(i) ) { - todegroup.push(Dart_pair(d1, d1->beta(i))); + if ( !amap.is_marked(d1->beta(i), mark) ) + todegroup.push(Dart_pair(d1, d1->beta(i))); d1->unlink_beta(i); } } @@ -291,7 +292,8 @@ namespace CGAL { { if ( !d2->is_free(CGAL_BETAINV(i)) ) { - todegroup.push(Dart_pair(d2, d2->beta_inv(i))); + if ( !amap.is_marked(d2->beta_inv(i), mark) ) + todegroup.push(Dart_pair(d2, d2->beta_inv(i))); d2->unlink_beta(CGAL_BETAINV(i)); } } @@ -301,7 +303,8 @@ namespace CGAL { d1 = (*it)->beta(i); if ( !d1->is_free(CGAL_BETAINV(i)) ) { - todegroup.push(Dart_pair(d1, d1->beta_inv(i))); + if ( !amap.is_marked(d1->beta_inv(i), mark)) + todegroup.push(Dart_pair(d1, d1->beta_inv(i))); d1->unlink_beta(CGAL_BETAINV(i)); } } From ad035ba1679b9906dfc40be986c8f0940264cc9e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 26 Mar 2012 16:52:17 +0000 Subject: [PATCH 031/102] Fix an important bug due to a typo ('z'<->'x') in the following commit: | ------------------------------------------------------------------------ | r66980 | sloriot | 2012-01-04 12:10:46 +0100 (Wed, 04 Jan 2012) | 3 lines | | follow up of r66938 to avoid int overflow (suggested by Laurent) | | | ------------------------------------------------------------------------ --- CGALimageIO/include/CGAL/Image_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGALimageIO/include/CGAL/Image_3.h index c726062decc..bf897af6228 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGALimageIO/include/CGAL/Image_3.h @@ -247,7 +247,7 @@ Image_3::trilinear_interpolation(const Coord_type& x, lz < 0 || lz >= dimz-1 || ly >= dimy-1 || - lz >= dimx-1) + lx >= dimx-1) { return transform(value_outside); } From 5bfb68ce95df3ec1e5d93fd29c35f6ec4cddb5da Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 26 Mar 2012 19:18:02 +0000 Subject: [PATCH 032/102] updated crontab (automated commit) --- Maintenance/infrastructure/cgal.geometryfactory.com/crontab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 8933715e931..175d6bc0540 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -18,9 +18,9 @@ # "next" alone #0 21 * * Mon,Tue,Wed,Thu,Fri,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it -#0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it +0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it # "next" + candidates -#0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it +0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it # - on trunk #0 21 * * Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it From 1fc6c4b599a44777958d6858a20ef7e0906bd511 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 26 Mar 2012 20:14:54 +0000 Subject: [PATCH 033/102] Backport of r68217 from branches/features/Linear_cell_complex_menger_sponge-gdamiand --- .../CGAL/internal/Combinatorial_map_functors.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h index 1189dc0c1da..1b545d29070 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h @@ -905,10 +905,10 @@ namespace CGAL { { CGAL_assertion(adart1 != NULL && adart2 != NULL && adart1!=adart2 ); CGAL_static_assertion( 2<=i && i<=CMap::dimension ); - adart1->basic_link_beta(adart2, i); - adart2->basic_link_beta(adart1, i); CMap::Helper::template Foreach_enabled_attributes >::run(&amap,adart1,adart2,i); + adart1->basic_link_beta(adart2, i); + adart2->basic_link_beta(adart1, i); } }; @@ -919,10 +919,10 @@ namespace CGAL { typename Map::Dart_handle adart2) { CGAL_assertion(adart1 != NULL && adart2 != NULL); - adart1->basic_link_beta(adart2,0); - adart2->basic_link_beta(adart1, 1); Map::Helper::template Foreach_enabled_attributes >::run(&amap,adart1,adart2,0); + adart1->basic_link_beta(adart2,0); + adart2->basic_link_beta(adart1, 1); } }; @@ -933,10 +933,10 @@ namespace CGAL { typename Map::Dart_handle adart2) { CGAL_assertion(adart1 != NULL && adart2 != NULL); - adart1->basic_link_beta(adart2,1); - adart2->basic_link_beta(adart1,0); Map::Helper::template Foreach_enabled_attributes >::run(&amap,adart1,adart2,1); + adart1->basic_link_beta(adart2,1); + adart2->basic_link_beta(adart1,0); } }; From daec68dc4302d34b3cd07f46f809e875750f6988 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 27 Mar 2012 09:35:13 +0000 Subject: [PATCH 034/102] Fix the Surface_mesher demo on gray level images - Now its works better with gray images that have negative values. - The research of seeds now create better initial points: the intersection points are search locally to the discovered connected components. --- .../demo/Surface_mesher/binary_image.h | 21 +++++++++-- Surface_mesher/demo/Surface_mesher/volume.cpp | 37 +++++++++++++++---- Surface_mesher/demo/Surface_mesher/volume.h | 13 +++++-- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/Surface_mesher/demo/Surface_mesher/binary_image.h b/Surface_mesher/demo/Surface_mesher/binary_image.h index 78fa56b16a4..ed7ea390a1d 100644 --- a/Surface_mesher/demo/Surface_mesher/binary_image.h +++ b/Surface_mesher/demo/Surface_mesher/binary_image.h @@ -21,6 +21,8 @@ #include #include +#include +#include #include #include @@ -36,8 +38,8 @@ class CBinary_image_3 : public CGAL::Image_3 bool labellized_; public: - float min_value; - float max_value; + double min_value; + double max_value; typedef FT_ FT; @@ -58,6 +60,17 @@ public: { } + void finish_open() { + CGAL_IMAGE_IO_CASE(image_ptr.get(), + Word *min; Word *max; + (boost::tie(min, max)) = + (CGAL::min_max_element((Word*)(data()), + (Word*)(data()) + + xdim() * ydim() * zdim())); + min_value = *min; + max_value = *max;) + } + float xmax() const { return (float)(((image_ptr->xdim) - 1.0)*(image_ptr->vx)); @@ -139,11 +152,11 @@ public: if(interpolation()) { if(labellized()) { CGAL_IMAGE_IO_CASE(image_ptr.get(), - return (this->labellized_trilinear_interpolation(x, y, z, 0));) + return (this->labellized_trilinear_interpolation(x, y, z, min_value));) } else { CGAL_IMAGE_IO_CASE(image_ptr.get(), - return (this->trilinear_interpolation(x, y, z, 0));) + return (this->trilinear_interpolation(x, y, z, min_value));) } } else { diff --git a/Surface_mesher/demo/Surface_mesher/volume.cpp b/Surface_mesher/demo/Surface_mesher/volume.cpp index 27838df8352..597a44a0fc2 100644 --- a/Surface_mesher/demo/Surface_mesher/volume.cpp +++ b/Surface_mesher/demo/Surface_mesher/volume.cpp @@ -3,6 +3,7 @@ #include // std::sort #include #include +#include #include @@ -582,6 +583,7 @@ bool Volume::open(const QString& filename) void Volume::finish_open() { + m_image.finish_open(); mw->viewer->camera()->setSceneBoundingBox(qglviewer::Vec(0, 0, 0), qglviewer::Vec(m_image.xmax(), m_image.ymax(), @@ -844,7 +846,8 @@ void Volume::display_surface_mesher_result() if(mw->searchSeedsCheckBox->isChecked()) { - std::vector seeds; + typedef std::vector > Seeds; + Seeds seeds; { std::cerr << "Search seeds...\n"; std::set domains; @@ -863,23 +866,31 @@ void Volume::display_surface_mesher_result() } } } - for(std::vector::const_iterator it = seeds.begin(), end = seeds.end(); + std::ofstream seeds_out("seeds.off"); + std::ofstream segments_out("segments.txt"); + seeds_out.precision(18); + seeds_out << "OFF\n" << seeds.size() << " 0 0\n"; + segments_out.precision(18); + for(Seeds::const_iterator it = seeds.begin(), end = seeds.end(); it != end; ++it) { - CGAL::Random_points_on_sphere_3 random_points_on_sphere_3(2*m_image.radius()); + seeds_out << it->first << std::endl; + CGAL::Random_points_on_sphere_3 random_points_on_sphere_3(it->second); Oracle::Intersect_3 intersect = oracle.intersect_3_object(); for(int i = 0; i < 20; ++i) { - const Point test = *it + (*random_points_on_sphere_3++ - CGAL::ORIGIN); - CGAL::Object o = intersect(surface, Segment_3(*it, test)); - if (const Point* intersection = CGAL::object_cast(&o)) + const Point test = it->first + (*random_points_on_sphere_3++ - CGAL::ORIGIN); + CGAL::Object o = intersect(surface, Segment_3(it->first, test)); + if (const Point* intersection = CGAL::object_cast(&o)) { + segments_out << "2 " << it->first << " " << *intersection << std::endl; del.insert(*intersection); + } else { std::cerr << boost::format("Error. Segment (%1%, %2%) does not intersect the surface! values=(%3%, %4%)\n") - % *it % test - % surface(*it) % surface(test); + % it->first % test + % surface(it->first) % surface(test); } } } @@ -890,6 +901,16 @@ void Volume::display_surface_mesher_result() 20); } + std::ofstream points_out("initial-points.off"); + points_out.precision(18); + points_out << "OFF\n" << c2t3.triangulation().number_of_vertices() << " 0 0\n"; + BOOST_FOREACH(const Tr::Vertex& v, + std::make_pair(c2t3.triangulation().vertices_begin(), + c2t3.triangulation().vertices_end())) + { + points_out << v.point() << std::endl; + } + std::cerr << boost::format("Number of initial points: %1%\n") % del.number_of_vertices(); // defining meshing criteria diff --git a/Surface_mesher/demo/Surface_mesher/volume.h b/Surface_mesher/demo/Surface_mesher/volume.h index fabfab33b49..db31c5e8cfe 100644 --- a/Surface_mesher/demo/Surface_mesher/volume.h +++ b/Surface_mesher/demo/Surface_mesher/volume.h @@ -212,11 +212,15 @@ void Volume::search_for_connected_components(PointsOutputIterator it, const unsigned int ny = m_image.ydim(); const unsigned int nz = m_image.zdim(); + const double max_v = (std::max)((std::max)(m_image.vx(), + m_image.vy()), + m_image.vz()); + typedef unsigned char Marker; typedef typename TransformOperator::result_type Label; boost::multi_array visited(boost::extents[nx][ny][nz]); - typedef boost::tuple Indices; + typedef boost::tuple Indices; typedef std::queue Indices_queue; typedef std::vector Border_vector; @@ -246,7 +250,7 @@ void Volume::search_for_connected_components(PointsOutputIterator it, int nb_voxels = 0; Indices_queue queue; - Indices indices(i, j ,k); + Indices indices(i, j ,k, 0); queue.push(indices); Border_vector border; @@ -271,6 +275,7 @@ void Volume::search_for_connected_components(PointsOutputIterator it, const int i = boost::get<0>(indices); const int j = boost::get<1>(indices); const int k = boost::get<2>(indices); + const int depth = boost::get<3>(indices); if(visited[i][j][k] < pass) { @@ -313,7 +318,7 @@ void Volume::search_for_connected_components(PointsOutputIterator it, if(transform(m_image.value(i_n, j_n, k_n)) == current_label) { if(visited[i_n][j_n][k_n] < pass) { - Indices indices(i_n, j_n, k_n); + Indices indices(i_n, j_n, k_n, depth+1); queue.push(indices); } } @@ -340,7 +345,7 @@ void Volume::search_for_connected_components(PointsOutputIterator it, { // if(nb_voxels >= 100) { - *it++ = m_image.point(i, j, k); + *it++ = std::make_pair(m_image.point(i, j, k), (depth+1)*max_v); std::cerr << boost::format("Found seed %5%, which is voxel (%1%, %2%, %3%), value=%4%\n") % i % j % k % m_image.value(i, j, k) % m_image.point(i, j, k); } From dc5e3b4015e01038eeebcc5523c46e8c1cc409f3 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Tue, 27 Mar 2012 12:41:41 +0000 Subject: [PATCH 035/102] Backport of r68222 from branches/features/Linear_cell_complex_menger_sponge-gdamiand/Combinatorial_map --- .../include/CGAL/Combinatorial_map.h | 29 ++++++++++++++++--- .../CGAL/Combinatorial_map_operations.h | 9 +++--- .../internal/Combinatorial_map_functors.h | 8 ++--- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 214cfcf959a..7e78a4dcb71 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -1298,10 +1298,24 @@ namespace CGAL { // If the two attributes are equal, nothing to do. if ( a1 == a2 ) return; - if ( a1==NULL ) - set_attribute_of_dart(dh1, a2); - else - set_attribute_of_dart(dh2, a1); + if ( a1==NULL ) set_attribute_of_dart(dh1, a2); + else set_attribute_of_dart(dh2, a1); + } + + /** Group all the dart attributes of adart1 and adart2, except the + * adim-cell attribute. + * @param adart1 the first dart. + * @param adart1 the second dart. + * @param adim the dimension to not group (-1 to group all dimensions). + * note that 0-attr are always grouped if adart1-> other_extremity()!=NULL. + */ + void group_all_dart_attributes_except(Dart_handle adart1, + Dart_handle adart2, int adim) + { + CGAL_assertion( adim==-1 || (1<=adim && (unsigned int)adim<=dimension) ); + Helper::template Foreach_enabled_attributes + >:: + run(this,adart1,adart2,adim); } /** Group all the cells attributes of adart1 and adart2, except the @@ -1309,6 +1323,7 @@ namespace CGAL { * @param adart1 the first dart. * @param adart1 the second dart. * @param adim the dimension to not group (-1 to group all dimensions). + * note that 0-attr are always grouped if adart1-> other_extremity()!=NULL. */ void group_all_attributes_except(Dart_handle adart1, Dart_handle adart2, int adim) @@ -1455,6 +1470,7 @@ namespace CGAL { " are disabled"); if ( is_marked(adart, amark) ) return true; bool valid = true; + bool found_dart = false; typename Attribute_const_handle::type a=adart->template attribute(); @@ -1466,6 +1482,8 @@ namespace CGAL { if ( it->template attribute() != a ) valid = false; + if ( a!=NULL && it==a->dart() ) found_dart = true; + mark(it, amark); ++nb; } @@ -1473,6 +1491,9 @@ namespace CGAL { if ( a!=NULL && a->get_nb_refs()!=nb ) valid = false; + if ( a!=NULL && a->dart()!=NULL && !found_dart ) + valid = false; + return valid; } diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 3267ff9a165..385e73fea34 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -610,8 +610,6 @@ namespace CGAL { if (!(*it)->is_free(1)) { amap.template basic_link_beta<1>(d1, (*it)->beta(1)); } - - amap.template link_beta<1>(*it, d1); for ( unsigned int dim = 2; dim<=Map::dimension; ++dim ) { @@ -621,7 +619,10 @@ namespace CGAL { amap.basic_link_beta(*it, (*it)->beta(dim)->beta(1), dim); } } - + + amap.template basic_link_beta<1>(*it, d1); + amap.group_all_dart_attributes_except(*it, d1, 1); + amap.mark(*it, mark); } @@ -631,8 +632,6 @@ namespace CGAL { amap.free_mark(mark); amap.template degroup_attribute<1>(adart, adart->beta(1)); - - // CGAL_postcondition(amap.is_valid()); return adart->beta(1); } diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h index 1b545d29070..c9eda04918a 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h @@ -855,7 +855,7 @@ namespace CGAL { { CGAL_assertion( adim==-1 || (0<=adim && (unsigned int)adim<=CMap::dimension) ); - + // todo ASSERT (1<=adim && ...) ??? if ( adim!=0 ) { typename CMap::Dart_handle od = dh1->other_extremity(); @@ -921,7 +921,7 @@ namespace CGAL { CGAL_assertion(adart1 != NULL && adart2 != NULL); Map::Helper::template Foreach_enabled_attributes >::run(&amap,adart1,adart2,0); - adart1->basic_link_beta(adart2,0); + adart1->basic_link_beta(adart2, 0); adart2->basic_link_beta(adart1, 1); } }; @@ -935,8 +935,8 @@ namespace CGAL { CGAL_assertion(adart1 != NULL && adart2 != NULL); Map::Helper::template Foreach_enabled_attributes >::run(&amap,adart1,adart2,1); - adart1->basic_link_beta(adart2,1); - adart2->basic_link_beta(adart1,0); + adart1->basic_link_beta(adart2, 1); + adart2->basic_link_beta(adart1, 0); } }; From 390c1590a88a80d4b507adb64ef9b73bb48a53ef Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 28 Mar 2012 13:47:08 +0000 Subject: [PATCH 037/102] Fix the parsing of dont_submit in branch build --- Installation/cmake/modules/CGAL_Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake index 62d048533f1..1df8999b5a9 100644 --- a/Installation/cmake/modules/CGAL_Macros.cmake +++ b/Installation/cmake/modules/CGAL_Macros.cmake @@ -482,7 +482,7 @@ function(process_CGAL_subdirectory entry subdir type_name) if(dont_submit_grep) set(ADD_SUBDIR FALSE) endif() - file(STRINGS ${entry}/../../dont_submit dont_submit_grep REGEX "^${subdir}") + file(STRINGS ${entry}/../../dont_submit dont_submit_grep REGEX "^${subdir}/?\$") if(dont_submit_grep) set(ADD_SUBDIR FALSE) endif() From 5771a62a83bf659e097b22c91b7c8cd158c8eb71 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 28 Mar 2012 13:48:33 +0000 Subject: [PATCH 038/102] Remove CGAL_FindPackageHandleStandardArgs.cmake FindPackageHandleStandardArg is a standard CMake module --- .gitattributes | 1 - .../CGAL_FindPackageHandleStandardArgs.cmake | 55 ------------------- .../cmake/modules/FindCGAL_CORE.cmake | 2 +- Installation/cmake/modules/FindCORE.cmake | 2 +- Installation/cmake/modules/FindGMP.cmake | 2 +- Installation/cmake/modules/FindGMPXX.cmake | 2 +- Installation/cmake/modules/FindMPFI.cmake | 2 +- Installation/cmake/modules/FindMPFR.cmake | 2 +- Installation/cmake/modules/FindNTL.cmake | 2 +- Installation/cmake/modules/FindRS.cmake | 2 +- 10 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake diff --git a/.gitattributes b/.gitattributes index 1e03b25677e..6bf27a594f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1724,7 +1724,6 @@ Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake -text Installation/cmake/modules/CGAL_Common.cmake -text Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake -text Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake -text -Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake -text Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake -text Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake -text Installation/cmake/modules/CGAL_Macros.cmake -text diff --git a/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake b/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake deleted file mode 100644 index ebb8e90e94e..00000000000 --- a/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake +++ /dev/null @@ -1,55 +0,0 @@ -# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) -# This macro is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and -# it also sets the _FOUND variable. -# The package is found if all variables listed are TRUE. -# Example: -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR) -# -# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and -# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. -# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, -# independent whether QUIET was used or not. -# If it is found, the location is reported using the VAR1 argument, so -# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out. -# If the second argument is DEFAULT_MSG, the message in the failure case will -# be "Could NOT find LibXml2", if you don't like this message you can specify -# your own custom failure message there. - -macro(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) - - if("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - set(_FAIL_MESSAGE "Could NOT find ${_NAME}") - else() - set(_FAIL_MESSAGE "${_FAIL_MSG}") - endif() - - string(TOUPPER ${_NAME} _NAME_UPPER) - - set(${_NAME_UPPER}_FOUND TRUE) - if(NOT ${_VAR1}) - set(${_NAME_UPPER}_FOUND FALSE) - endif() - - foreach(_CURRENT_VAR ${ARGN}) - if(NOT ${_CURRENT_VAR}) - set(${_NAME_UPPER}_FOUND FALSE) - endif() - endforeach() - - if (${_NAME_UPPER}_FOUND) - if (NOT ${_NAME}_FIND_QUIETLY) - message(STATUS "Found ${_NAME}: ${${_VAR1}}") - endif() - else() - if (${_NAME}_FIND_REQUIRED) - message(FATAL_ERROR "${_FAIL_MESSAGE}") - else() - if (NOT ${_NAME}_FIND_QUIETLY) - message(STATUS "${_FAIL_MESSAGE}") - endif() - endif() - endif() - -endmacro() diff --git a/Installation/cmake/modules/FindCGAL_CORE.cmake b/Installation/cmake/modules/FindCGAL_CORE.cmake index 946af735ef7..b2578b306e1 100644 --- a/Installation/cmake/modules/FindCGAL_CORE.cmake +++ b/Installation/cmake/modules/FindCGAL_CORE.cmake @@ -7,7 +7,7 @@ # CORE needs GMP -include(CGAL_FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) if(GMP_FOUND) diff --git a/Installation/cmake/modules/FindCORE.cmake b/Installation/cmake/modules/FindCORE.cmake index 05a0ef3aae4..6effa1d5e52 100644 --- a/Installation/cmake/modules/FindCORE.cmake +++ b/Installation/cmake/modules/FindCORE.cmake @@ -6,7 +6,7 @@ # TODO: support Windows and MacOSX # CORE needs GMP -include(CGAL_FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) if(GMP_FOUND) if (CORE_INCLUDE_DIR AND CORE_LIBRARIES) diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake index 76ad2d9770f..797099912ef 100644 --- a/Installation/cmake/modules/FindGMP.cmake +++ b/Installation/cmake/modules/FindGMP.cmake @@ -7,7 +7,7 @@ # TODO: support MacOSX -include(CGAL_FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) include(CGAL_GeneratorSpecificSettings) if(GMP_INCLUDE_DIR) diff --git a/Installation/cmake/modules/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake index 333cd1d44b6..f32e4458299 100644 --- a/Installation/cmake/modules/FindGMPXX.cmake +++ b/Installation/cmake/modules/FindGMPXX.cmake @@ -26,7 +26,7 @@ if(GMP_FOUND) DOC "Path to the GMPXX library" ) - include(CGAL_FindPackageHandleStandardArgs) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GMPXX "DEFAULT_MSG" GMPXX_LIBRARIES GMPXX_INCLUDE_DIR ) diff --git a/Installation/cmake/modules/FindMPFI.cmake b/Installation/cmake/modules/FindMPFI.cmake index b9975a77a7a..4456125f22f 100644 --- a/Installation/cmake/modules/FindMPFI.cmake +++ b/Installation/cmake/modules/FindMPFI.cmake @@ -24,7 +24,7 @@ if( GMP_FOUND ) include( MPFIConfig OPTIONAL ) endif( NOT MPFI_INCLUDE_DIR OR NOT MPFI_LIBRARIES_DIR ) - include(CGAL_FindPackageHandleStandardArgs) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MPFI "DEFAULT_MSG" MPFI_LIBRARIES MPFI_INCLUDE_DIR ) diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake index 2453f66fc03..94f41f9d9a6 100644 --- a/Installation/cmake/modules/FindMPFR.cmake +++ b/Installation/cmake/modules/FindMPFR.cmake @@ -7,7 +7,7 @@ # TODO: support MacOSX -include(CGAL_FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) include(CGAL_GeneratorSpecificSettings) if(MPFR_INCLUDE_DIR) diff --git a/Installation/cmake/modules/FindNTL.cmake b/Installation/cmake/modules/FindNTL.cmake index d6d43e1cb1c..4ee892eb344 100644 --- a/Installation/cmake/modules/FindNTL.cmake +++ b/Installation/cmake/modules/FindNTL.cmake @@ -80,7 +80,7 @@ else( NOT GMP_FOUND ) get_filename_component(NTL_LIBRARIES_DIR ${NTL_LIBRARIES} PATH CACHE ) - include(CGAL_FindPackageHandleStandardArgs) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( NTL DEFAULT_MSG diff --git a/Installation/cmake/modules/FindRS.cmake b/Installation/cmake/modules/FindRS.cmake index b17b2c0b2dd..c6d01331659 100644 --- a/Installation/cmake/modules/FindRS.cmake +++ b/Installation/cmake/modules/FindRS.cmake @@ -62,7 +62,7 @@ if( MPFI_FOUND ) include( RSConfig OPTIONAL ) endif( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR ) - include(CGAL_FindPackageHandleStandardArgs) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( RS "DEFAULT_MSG" From 28ecd11d9535b2ba37fca6ca79f1285cd0a716f6 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 28 Mar 2012 13:50:41 +0000 Subject: [PATCH 039/102] Remove that file that is also a standard CMake module --- .gitattributes | 1 - .../cmake/modules/FindPackageMessage.cmake | 35 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 Installation/cmake/modules/FindPackageMessage.cmake diff --git a/.gitattributes b/.gitattributes index 6bf27a594f2..65bb71a4d98 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1763,7 +1763,6 @@ Installation/cmake/modules/FindMPFI.cmake -text Installation/cmake/modules/FindMPFR.cmake -text Installation/cmake/modules/FindNTL.cmake -text Installation/cmake/modules/FindOpenGL.cmake -text -Installation/cmake/modules/FindPackageMessage.cmake -text Installation/cmake/modules/FindQGLViewer.cmake -text Installation/cmake/modules/FindQt3-patched.cmake -text Installation/cmake/modules/FindRS.cmake -text diff --git a/Installation/cmake/modules/FindPackageMessage.cmake b/Installation/cmake/modules/FindPackageMessage.cmake deleted file mode 100644 index b7e51b0ad7b..00000000000 --- a/Installation/cmake/modules/FindPackageMessage.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# FIND_PACKAGE_MESSAGE( "message for user" "find result details") -# -# This macro is intended to be used in FindXXX.cmake modules files. -# It will print a message once for each unique find result. -# This is useful for telling the user where a package was found. -# The first argument specifies the name (XXX) of the package. -# The second argument specifies the message to display. -# The third argument lists details about the find result so that -# if they change the message will be displayed again. -# The macro also obeys the QUIET argument to the find_package command. -# -# Example: -# -# IF(X11_FOUND) -# FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}" -# "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]") -# ELSE(X11_FOUND) -# ... -# ENDIF(X11_FOUND) - -macro(FIND_PACKAGE_MESSAGE pkg msg details) - # Avoid printing a message repeatedly for the same find result. - IF(NOT ${pkg}_FIND_QUIETLY) - SET(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg}) - IF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}") - # The message has not yet been printed. - MESSAGE(STATUS "${msg}") - - # Save the find details in the cache to avoid printing the same - # message again. - SET("${DETAILS_VAR}" "${details}" - CACHE INTERNAL "Details about finding ${pkg}") - ENDIF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}") - ENDIF(NOT ${pkg}_FIND_QUIETLY) -endmacro(FIND_PACKAGE_MESSAGE) From 0b781e5986735e512ee7fb848d98e57d0f173b93 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 28 Mar 2012 14:38:04 +0000 Subject: [PATCH 040/102] Remove FindBoost. Upstream CMake FindBoost script is better that ours. --- .gitattributes | 1 - Installation/cmake/modules/FindBoost.cmake | 929 -------------------- Installation/cmake/modules/FindOpenGL.cmake | 2 +- 3 files changed, 1 insertion(+), 931 deletions(-) delete mode 100644 Installation/cmake/modules/FindBoost.cmake diff --git a/.gitattributes b/.gitattributes index 65bb71a4d98..fa0e3ffdd7b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1746,7 +1746,6 @@ Installation/cmake/modules/CGAL_UseRS.cmake -text Installation/cmake/modules/CGAL_UseTAUCS.cmake -text Installation/cmake/modules/CGAL_VersionUtils.cmake -text Installation/cmake/modules/FindBLAS.cmake -text -Installation/cmake/modules/FindBoost.cmake -text Installation/cmake/modules/FindCGAL.cmake -text Installation/cmake/modules/FindCGAL_CORE.cmake -text Installation/cmake/modules/FindCORE.cmake -text diff --git a/Installation/cmake/modules/FindBoost.cmake b/Installation/cmake/modules/FindBoost.cmake deleted file mode 100644 index 7ae9e373ca0..00000000000 --- a/Installation/cmake/modules/FindBoost.cmake +++ /dev/null @@ -1,929 +0,0 @@ -# - Try to find Boost include dirs and libraries -# Usage of this module as follows: -# -# == Using Header-Only libraries from within Boost: == -# -# find_package( Boost 1.38.0 ) -# if(Boost_FOUND) -# include_directories(${Boost_INCLUDE_DIRS}) -# add_executable(foo foo.cc) -# endif() -# -# -# == Using actual libraries from within Boost: == -# -# set(Boost_USE_STATIC_LIBS ON) -# set(Boost_USE_MULTITHREADED ON) -# find_package( Boost 1.38.0 COMPONENTS date_time filesystem system ... ) -# -# if(Boost_FOUND) -# include_directories(${Boost_INCLUDE_DIRS}) -# add_executable(foo foo.cc) -# target_link_libraries(foo ${Boost_LIBRARIES}) -# endif() -# -# -# The components list needs to contain actual names of boost libraries only, -# such as "date_time" for "libboost_date_time". If you're using parts of -# Boost that contain header files only (e.g. foreach) you do not need to -# specify COMPONENTS. -# -# You should provide a minimum version number that should be used. If you provide this -# version number and specify the REQUIRED attribute, this module will fail if it -# can't find the specified or a later version. If you specify a version number this is -# automatically put into the considered list of version numbers and thus doesn't need -# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below). -# -# NOTE for Visual Studio Users: -# Automatic linking is used on MSVC & Borland compilers by default when -# #including things in Boost. It's important to note that setting -# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking, -# should you need this feature. Automatic linking typically uses static -# libraries with a few exceptions (Boost.Python is one). -# -# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for -# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example -# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS -# gets set to OFF. It is suggested you avoid automatic linking since it -# will make your application less portable. -# -# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============ -# -# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of -# boost version numbers that should be taken into account when searching -# for Boost. Unfortunately boost puts the version number into the -# actual filename for the libraries, so this variable will certainly be needed -# in the future when new Boost versions are released. -# -# Currently this module searches for the following version numbers: -# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, -# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.38.1 -# 1.39, 1.39.0, 1.39.1 1.40, 1.40.0, 1.40.1 1.41, 1.41.0, 1.41.1 -# 1.42, 1.42.0, 1.42.1 -# -# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should -# add both 1.x and 1.x.0 as shown above. Official Boost include directories -# omit the 3rd version number from include paths if it is 0 although not all -# binary Boost releases do so. -# -# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0") -# -# ============================================================================ -# -# Variables used by this module, they can change the default behaviour and -# need to be set before calling find_package: -# -# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded -# boost libraries. If not specified, defaults -# to ON. -# -# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static -# boost libraries. Defaults to OFF. -# -# Other Variables used by this module which you may want to set. -# -# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching -# the boost include directory. Please see -# the documentation above regarding this -# annoying, but necessary variable :( -# -# Boost_DEBUG Set this to TRUE to enable debugging output -# of FindBoost.cmake if you are having problems. -# Please enable this before filing any bug -# reports. -# -# Boost_COMPILER Set this to the compiler suffix used by Boost -# (e.g. "-gcc43") if FindBoost has problems finding -# the proper Boost installation -# -# These last three variables are available also as environment variables: -# -# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for -# Boost. Set this if the module has problems finding -# the proper Boost installation. -# -# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the -# module has problems finding the proper Boost installation -# -# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the -# module has problems finding the proper Boost installation -# -# Variables defined by this module: -# -# Boost_FOUND System has Boost, this means the include dir was -# found, as well as all the libraries specified in -# the COMPONENTS list. -# -# Boost_INCLUDE_DIRS Boost include directories: not cached -# -# Boost_INCLUDE_DIR This is almost the same as above, but this one is -# cached and may be modified by advanced users -# -# Boost_LIBRARIES Link to these to use the Boost libraries that you -# specified: not cached -# -# Boost_LIBRARY_DIRS The path to where the Boost library files are. -# -# Boost_VERSION The version number of the boost libraries that -# have been found, same as in version.hpp from Boost -# -# Boost_LIB_VERSION The version number in filename form as -# it's appended to the library filenames -# -# Boost_MAJOR_VERSION major version number of boost -# Boost_MINOR_VERSION minor version number of boost -# Boost_SUBMINOR_VERSION subminor version number of boost -# -# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call -# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS}) -# to have diagnostic information about Boost's -# automatic linking outputted during compilation time. -# -# For each component you specify in find_package(), the following (UPPER-CASE) -# variables are set. You can use these variables if you would like to pick and -# choose components for your targets instead of just using Boost_LIBRARIES. -# -# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found. -# -# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost -# "component" (includes debug and optimized keywords -# when needed). -# -# ===================================================================== -# -# -# Copyright (c) 2006-2008 Andreas Schneider -# Copyright (c) 2007 Wengo -# Copyright (c) 2007 Mike Jackson -# Copyright (c) 2008 Andreas Pakulat -# -# Redistribution AND use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - -# -# Adapted for CGAL (wwww.cgal.org) by fernando.cacciola@geometryfactory.com, 2009 -# - -include( CGAL_VersionUtils ) - - -#------------------------------------------------------------------------------- -# FindBoost functions & macros -# -############################################ -# -# Check the existence of the libraries. -# -############################################ -# This macro was taken directly from the FindQt4.cmake file that is included -# with the CMake distribution. This is NOT my work. All work was done by the -# original authors of the FindQt4.cmake file. Only minor modifications were -# made to remove references to Qt and make this file more generally applicable -# And ELSE/ENDIF pairs were removed for readability. -######################################################################### - -MACRO (_Boost_ADJUST_LIB_VARS basename) - IF (Boost_INCLUDE_DIR ) - IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE) - # if the generator supports configuration types then set - # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value - IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG}) - ELSE() - # if there are no configuration types and CMAKE_BUILD_TYPE has no value - # then just use the release libraries - SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} ) - ENDIF() - # FIXME: This probably should be set for both cases - SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG}) - ENDIF() - - # if only the release version was found, set the debug variable also to the release version - IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG) - SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE}) - SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE}) - SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE}) - ENDIF() - - # if only the debug version was found, set the release variable also to the debug version - IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE) - SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG}) - SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG}) - SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG}) - ENDIF() - - IF (Boost_${basename}_LIBRARY) - set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library") - - # Remove superfluous "debug" / "optimized" keywords from - # Boost_LIBRARY_DIRS - FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY}) - GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH) - if ( NOT "${_boost_my_lib_path}" STREQUAL "" ) - LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path}) - endif() - ENDFOREACH() - - set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory") - SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found") - ENDIF(Boost_${basename}_LIBRARY) - - ENDIF (Boost_INCLUDE_DIR ) - # Make variables changeble to the advanced user - MARK_AS_ADVANCED( - Boost_${basename}_LIBRARY - Boost_${basename}_LIBRARY_RELEASE - Boost_${basename}_LIBRARY_DEBUG - ) -ENDMACRO (_Boost_ADJUST_LIB_VARS) - -#------------------------------------------------------------------------------- - -# -# Runs compiler with "-dumpversion" and parses major/minor -# version with a regex. -# -MACRO(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION) - - EXEC_PROGRAM(${CMAKE_CXX_COMPILER} - ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE _boost_COMPILER_VERSION - ) - STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" - _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION}) - - SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION}) -ENDMACRO() - -# -# End functions/macros -# -#------------------------------------------------------------------------------- - - - - -IF(NOT DEFINED Boost_USE_MULTITHREADED) - SET(Boost_USE_MULTITHREADED TRUE) -ENDIF() - -if(Boost_FIND_VERSION_EXACT) - # The version may appear in a directory with or without the patch - # level, even when the patch level is non-zero. - set(_boost_TEST_VERSIONS - "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}" - "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") -else(Boost_FIND_VERSION_EXACT) - # The user has not requested an exact version. Among known - # versions, find those that are acceptable to the user request. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} - "1.45.1" "1.45.0" "1.45" - "1.44.1" "1.44.0" "1.44" - "1.43.1" "1.43.0" "1.43" - "1.42.1" "1.42.0" "1.42" - "1.41.1" "1.41.0" "1.41" - "1.40.1" "1.40.0" "1.40" - "1.39.1" "1.39.0" "1.39" - "1.38.1" "1.38.0" "1.38" - "1.37.0" "1.37" - "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" - "1.34" "1.33.1" "1.33.0" "1.33") - set(_boost_TEST_VERSIONS) - if(Boost_FIND_VERSION) - set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") - # Select acceptable versions. - foreach(version ${_Boost_KNOWN_VERSIONS}) - IS_VERSION_LESS( "${version}" "${Boost_FIND_VERSION}" _Boost_IS_VERSION_LESS ) - if(NOT _Boost_IS_VERSION_LESS ) - # This version is high enough. - list(APPEND _boost_TEST_VERSIONS "${version}") - else() - IS_VERSION_EQUAL( "${version}" "${_Boost_FIND_VERSION_SHORT}" _Boost_IS_VERSION_EQUAL ) - if( _Boost_IS_VERSION_EQUAL ) - # This version is a short-form for the requested version with - # the patch level dropped. - list(APPEND _boost_TEST_VERSIONS "${version}") - endif() - endif() - endforeach(version) - else(Boost_FIND_VERSION) - # Any version is acceptable. - set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}") - endif(Boost_FIND_VERSION) -endif(Boost_FIND_VERSION_EXACT) - -# The reason that we failed to find Boost. This will be set to a -# user-friendly message when we fail to find some necessary piece of -# Boost. -set(Boost_ERROR_REASON) - - -SET( _boost_IN_CACHE TRUE) -IF(Boost_INCLUDE_DIR) - FOREACH(COMPONENT ${Boost_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} COMPONENT) - IF(NOT Boost_${COMPONENT}_FOUND) - SET( _boost_IN_CACHE FALSE) - ENDIF(NOT Boost_${COMPONENT}_FOUND) - ENDFOREACH(COMPONENT) -ELSE(Boost_INCLUDE_DIR) - SET( _boost_IN_CACHE FALSE) -ENDIF(Boost_INCLUDE_DIR) - -IF (_boost_IN_CACHE) - # in cache already - SET(Boost_FOUND TRUE) - FOREACH(COMPONENT ${Boost_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} COMPONENT) - _Boost_ADJUST_LIB_VARS( ${COMPONENT} ) - SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY}) - ENDFOREACH(COMPONENT) - SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR}) - IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0") - MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000") - MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000") - MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100") - ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0") - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} " - "is already in the cache. For debugging messages, please clear the cache.") - endif() -ELSE (_boost_IN_CACHE) - # Need to search for boost - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "Boost not in cache") - # Output some of their choices - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}") - endif() - - IF(WIN32) - # In windows, automatic linking is performed, so you do not have - # to specify the libraries. If you are linking to a dynamic - # runtime, then you can choose to link to either a static or a - # dynamic Boost library, the default is to do a static link. You - # can alter this for a specific library "whatever" by defining - # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be - # linked dynamically. Alternatively you can force all Boost - # libraries to dynamic link by defining BOOST_ALL_DYN_LINK. - - # This feature can be disabled for Boost library "whatever" by - # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining - # BOOST_ALL_NO_LIB. - - # If you want to observe which libraries are being linked against - # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking - # code to emit a #pragma message each time a library is selected - # for linking. - SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS - "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define") - ENDIF(WIN32) - - set( boost_ENV_PROGRAM_FILES_DIR $ENV{ProgramFiles} ) - file(TO_CMAKE_PATH "${boost_ENV_PROGRAM_FILES_DIR}" boost_ENV_PROGRAM_FILES_DIR) - - SET(_boost_INCLUDE_SEARCH_DIRS - C:/boost/include - C:/boost - "${boost_ENV_PROGRAM_FILES_DIR}/boost" - /sw/local/include - ) - - # If BOOST_ROOT was defined in the environment, use it. - if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") - set(BOOST_ROOT $ENV{BOOST_ROOT}) - endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") - - # If BOOSTROOT was defined in the environment, use it. - if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "") - set(BOOST_ROOT $ENV{BOOSTROOT}) - endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "") - - # If BOOST_INCLUDEDIR was defined in the environment, use it. - IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" ) - set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR}) - ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" ) - - # If BOOST_LIBRARYDIR was defined in the environment, use it. - IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" ) - set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR}) - ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" ) - - IF( BOOST_ROOT ) - file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT) - ENDIF( BOOST_ROOT ) - - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "Declared as CMake or Environmental Variables:") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - " BOOST_ROOT = ${BOOST_ROOT}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}") - endif() - - IF( BOOST_ROOT ) - SET(_boost_INCLUDE_SEARCH_DIRS - ${BOOST_ROOT}/include - ${BOOST_ROOT} - ${_boost_INCLUDE_SEARCH_DIRS}) - ENDIF( BOOST_ROOT ) - - IF( BOOST_INCLUDEDIR ) - file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR) - SET(_boost_INCLUDE_SEARCH_DIRS - ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS}) - ENDIF( BOOST_INCLUDEDIR ) - - # ------------------------------------------------------------------------ - # Search for Boost include DIR - # ------------------------------------------------------------------------ - # Try to find Boost by stepping backwards through the Boost versions - # we know about. - IF( NOT Boost_INCLUDE_DIR ) - # Build a list of path suffixes for each version. - SET(_boost_PATH_SUFFIXES) - FOREACH(_boost_VER ${_boost_TEST_VERSIONS}) - # Add in a path suffix, based on the required version, ideally - # we could read this from version.hpp, but for that to work we'd - # need to know the include dir already - set(_boost_BOOSTIFIED_VERSION) - - # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0 - IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+") - STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3" - _boost_BOOSTIFIED_VERSION ${_boost_VER}) - ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+") - STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2" - _boost_BOOSTIFIED_VERSION ${_boost_VER}) - ENDIF() - - list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}") - if(WIN32) - # For BoostPro's underscores (and others?) - list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}") - endif() - - ENDFOREACH(_boost_VER) - - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "Include debugging info:") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}") - endif() - - # Look for a standard boost header file (search in user defined directories first) - FIND_PATH(Boost_INCLUDE_DIR - NAMES boost/config.hpp - PATHS ${_boost_INCLUDE_SEARCH_DIRS} - PATH_SUFFIXES ${_boost_PATH_SUFFIXES} - NO_DEFAULT_PATH - ) - - FIND_PATH(Boost_INCLUDE_DIR - NAMES boost/config.hpp - PATH_SUFFIXES ${_boost_PATH_SUFFIXES} - ) - - ENDIF( NOT Boost_INCLUDE_DIR ) - - # ------------------------------------------------------------------------ - # Extract version information from version.hpp - # ------------------------------------------------------------------------ - - IF(Boost_INCLUDE_DIR) - # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp - # Read the whole file: - # - SET(BOOST_VERSION 0) - SET(BOOST_LIB_VERSION "") - FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS) - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp") - endif() - - STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}") - STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}") - - SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries") - SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries") - - IF(NOT "${Boost_VERSION}" STREQUAL "0") - MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000") - MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000") - MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100") - - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}") - ENDIF(NOT "${Boost_VERSION}" STREQUAL "0") - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "version.hpp reveals boost " - "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") - endif() - ELSE(Boost_INCLUDE_DIR) - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.") - ENDIF(Boost_INCLUDE_DIR) - - # ------------------------------------------------------------------------ - # Suffix initialization and compiler suffix detection. - # ------------------------------------------------------------------------ - - # Setting some more suffixes for the library - SET (Boost_LIB_PREFIX "") - if ( WIN32 AND Boost_USE_STATIC_LIBS ) - SET (Boost_LIB_PREFIX "lib") - endif() - - if (Boost_COMPILER) - set(_boost_COMPILER ${Boost_COMPILER}) - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "using user-specified Boost_COMPILER = ${_boost_COMPILER}") - endif() - else(Boost_COMPILER) - - SET(_boost_COMPILER "-gcc") # Fall back to GCC for cygwin - - # Attempt to guess the compiler suffix - # NOTE: this is not perfect yet, if you experience any issues - # please report them and use the Boost_COMPILER variable - # to work around the problems. - if (MSVC11) - SET (_boost_COMPILER "-vc110") - elseif (MSVC10) - SET (_boost_COMPILER "-vc100") - elseif (MSVC90) - SET (_boost_COMPILER "-vc90") - elseif (MSVC80) - SET (_boost_COMPILER "-vc80") - elseif (MSVC71) - SET (_boost_COMPILER "-vc71") - elseif (MSVC70) # Good luck! - SET (_boost_COMPILER "-vc7") # yes, this is correct - elseif (MSVC60) # Good luck! - SET (_boost_COMPILER "-vc6") # yes, this is correct - elseif (BORLAND) - SET (_boost_COMPILER "-bcb") - elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl" - OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") - if(WIN32) - set (_boost_COMPILER "-iw") - else() - set (_boost_COMPILER "-il") - endif() - elseif (MINGW) - - IS_VERSION_LESS( "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" "1.34" _Boost_IS_VERSION_LESS ) - if( _Boost_IS_VERSION_LESS ) - SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34 - else() - _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION) - SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}") - endif() - elseif (UNIX) - if (CMAKE_COMPILER_IS_GNUCXX) - IS_VERSION_LESS( "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" "1.34" _Boost_IS_VERSION_LESS ) - if( _Boost_IS_VERSION_LESS ) - SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34 - else() - _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION) - # Determine which version of GCC we have. - IF(APPLE) - IF(Boost_MINOR_VERSION) - IF(${Boost_MINOR_VERSION} GREATER 35) - # In Boost 1.36.0 and newer, the mangled compiler name used - # on Mac OS X/Darwin is "xgcc". - SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}") - ELSE(${Boost_MINOR_VERSION} GREATER 35) - # In Boost <= 1.35.0, there is no mangled compiler name for - # the Mac OS X/Darwin version of GCC. - SET(_boost_COMPILER "") - ENDIF(${Boost_MINOR_VERSION} GREATER 35) - ELSE(Boost_MINOR_VERSION) - # We don't know the Boost version, so assume it's - # pre-1.36.0. - SET(_boost_COMPILER "") - ENDIF(Boost_MINOR_VERSION) - ELSE() - SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}") - ENDIF() - endif() - endif (CMAKE_COMPILER_IS_GNUCXX) - endif() - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "guessed _boost_COMPILER = ${_boost_COMPILER}") - endif() - endif(Boost_COMPILER) - - SET (_boost_MULTITHREADED "-mt") - if( NOT Boost_USE_MULTITHREADED ) - set (_boost_MULTITHREADED "") - endif() - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_MULTITHREADED = ${_boost_MULTITHREADED}") - endif() - - SET( _boost_STATIC_TAG "") - set( _boost_ABI_TAG "") - IF (WIN32) - IF(MSVC) - SET (_boost_ABI_TAG "g") - ENDIF(MSVC) - IF( Boost_USE_STATIC_LIBS ) - SET( _boost_STATIC_TAG "-s") - ENDIF( Boost_USE_STATIC_LIBS ) - ENDIF(WIN32) - SET (_boost_ABI_TAG "${_boost_ABI_TAG}d") - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_STATIC_TAG = ${_boost_STATIC_TAG}") - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_ABI_TAG = ${_boost_ABI_TAG}") - endif() - - # ------------------------------------------------------------------------ - # Begin finding boost libraries - # ------------------------------------------------------------------------ - - SET(_boost_LIBRARIES_SEARCH_DIRS - C:/boost/lib - C:/boost - "${boost_ENV_PROGRAM_FILES_DIR}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib" - "${boost_ENV_PROGRAM_FILES_DIR}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib" - "${boost_ENV_PROGRAM_FILES_DIR}/boost" - /sw/local/lib - ) - IF( BOOST_ROOT ) - SET(_boost_LIBRARIES_SEARCH_DIRS - ${BOOST_ROOT}/lib - ${BOOST_ROOT}/stage/lib - ${_boost_LIBRARIES_SEARCH_DIRS}) - ENDIF( BOOST_ROOT ) - - IF( BOOST_LIBRARYDIR ) - file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR) - SET(_boost_LIBRARIES_SEARCH_DIRS - ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS}) - ENDIF( BOOST_LIBRARYDIR ) - - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}") - endif() - - FOREACH(COMPONENT ${Boost_FIND_COMPONENTS}) - STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) - SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" ) - SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" ) - SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND") - - # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES - IF( Boost_USE_STATIC_LIBS ) - SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - IF(WIN32) - SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - ELSE(WIN32) - SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - ENDIF(WIN32) - ENDIF( Boost_USE_STATIC_LIBS ) - - # Find libraries (search in user defined directories first) - SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT} - ) - - FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE - NAMES ${_boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES} - PATHS ${_boost_LIBRARIES_SEARCH_DIRS} - NO_DEFAULT_PATH - ) - - FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE - NAMES ${_boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES} - ) - - - SET ( _boost_${UPPERCOMPONENT}_LIBRARY_DEBUG_NAMES - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG} - ) - - FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG - NAMES ${_boost_${UPPERCOMPONENT}_LIBRARY_DEBUG_NAMES} - PATHS ${_boost_LIBRARIES_SEARCH_DIRS} - NO_DEFAULT_PATH - ) - - FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG - NAMES ${_boost_${UPPERCOMPONENT}_LIBRARY_DEBUG_NAMES} - ) - - _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT}) - IF( Boost_USE_STATIC_LIBS ) - SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) - ENDIF( Boost_USE_STATIC_LIBS ) - ENDFOREACH(COMPONENT) - # ------------------------------------------------------------------------ - # End finding boost libraries - # ------------------------------------------------------------------------ - - SET(Boost_INCLUDE_DIRS - ${Boost_INCLUDE_DIR} - ) - - SET(Boost_FOUND FALSE) - IF(Boost_INCLUDE_DIR) - SET( Boost_FOUND TRUE ) - - # Check the version of Boost against the requested version. - if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR) - message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34") - endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR) - if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" ) - set( Boost_FOUND FALSE ) - set(_Boost_VERSION_AGE "old") - elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" ) - if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" ) - set( Boost_FOUND FALSE ) - set(_Boost_VERSION_AGE "old") - elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" ) - if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" ) - set( Boost_FOUND FALSE ) - set(_Boost_VERSION_AGE "old") - endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" ) - endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" ) - endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" ) - - if (Boost_FOUND AND Boost_FIND_VERSION_EXACT) - # If the user requested an exact version of Boost, check - # that. We already know that the Boost version we have is >= the - # requested version. - set(_Boost_VERSION_AGE "new") - - # If the user didn't specify a patchlevel, it's 0. - if (NOT Boost_FIND_VERSION_PATCH) - set(Boost_FIND_VERSION_PATCH 0) - endif (NOT Boost_FIND_VERSION_PATCH) - - # We'll set Boost_FOUND true again if we have an exact version match. - set(Boost_FOUND FALSE) - if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" ) - if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" ) - if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" ) - set( Boost_FOUND TRUE ) - endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" ) - endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" ) - endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" ) - endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT) - - if(NOT Boost_FOUND) - # State that we found a version of Boost that is too new or too old. - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") - if (Boost_FIND_VERSION_PATCH) - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}") - endif (Boost_FIND_VERSION_PATCH) - if (NOT Boost_FIND_VERSION_EXACT) - set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)") - endif (NOT Boost_FIND_VERSION_EXACT) - set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.") - endif (NOT Boost_FOUND) - - if (Boost_FOUND) - set(_boost_CHECKED_COMPONENT FALSE) - set(_Boost_MISSING_COMPONENTS) - foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - string(TOUPPER ${COMPONENT} COMPONENT) - set(_boost_CHECKED_COMPONENT TRUE) - if(NOT Boost_${COMPONENT}_FOUND) - string(TOLOWER ${COMPONENT} COMPONENT) - list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT}) - set( Boost_FOUND FALSE) - endif(NOT Boost_${COMPONENT}_FOUND) - endforeach(COMPONENT) - endif (Boost_FOUND) - - if(Boost_DEBUG) - message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}") - endif() - - if (_Boost_MISSING_COMPONENTS) - # We were unable to find some libraries, so generate a sensible - # error message that lists the libraries we were unable to find. - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n") - foreach(COMPONENT ${_Boost_MISSING_COMPONENTS}) - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON} boost_${COMPONENT}\n") - endforeach(COMPONENT) - - list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED) - list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS) - if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS}) - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") - else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS}) - set(Boost_ERROR_REASON - "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") - endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS}) - endif (_Boost_MISSING_COMPONENTS) - - IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT ) - # Compatibility Code for backwards compatibility with CMake - # 2.4's FindBoost module. - - # Look for the boost library path. - # Note that the user may not have installed any libraries - # so it is quite possible the Boost_LIBRARY_PATH may not exist. - SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR}) - - IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+") - GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH) - ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+") - - IF("${_boost_LIB_DIR}" MATCHES "/include$") - # Strip off the trailing "/include" in the path. - GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH) - ENDIF("${_boost_LIB_DIR}" MATCHES "/include$") - - IF(EXISTS "${_boost_LIB_DIR}/lib") - SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib) - ELSE(EXISTS "${_boost_LIB_DIR}/lib") - IF(EXISTS "${_boost_LIB_DIR}/stage/lib") - SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib) - ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib") - SET(_boost_LIB_DIR "") - ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib") - ENDIF(EXISTS "${_boost_LIB_DIR}/lib") - - IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}") - SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory") - ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}") - - ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT ) - - ELSE(Boost_INCLUDE_DIR) - SET( Boost_FOUND FALSE) - ENDIF(Boost_INCLUDE_DIR) - - IF (Boost_FOUND) - IF (NOT Boost_FIND_QUIETLY) - MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") - ENDIF(NOT Boost_FIND_QUIETLY) - IF (NOT Boost_FIND_QUIETLY) - MESSAGE(STATUS "Found the following Boost libraries:") - ENDIF(NOT Boost_FIND_QUIETLY) - FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} ) - STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT ) - IF ( Boost_${UPPERCOMPONENT}_FOUND ) - IF (NOT Boost_FIND_QUIETLY) - MESSAGE (STATUS " ${COMPONENT}") - ENDIF(NOT Boost_FIND_QUIETLY) - SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY}) - ENDIF ( Boost_${UPPERCOMPONENT}_FOUND ) - ENDFOREACH(COMPONENT) - ELSE (Boost_FOUND) - IF (Boost_FIND_REQUIRED) - message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}") - ENDIF(Boost_FIND_REQUIRED) - ENDIF(Boost_FOUND) - - # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view - MARK_AS_ADVANCED(Boost_INCLUDE_DIR - Boost_INCLUDE_DIRS - Boost_LIBRARY_DIRS - ) -ENDIF(_boost_IN_CACHE) - diff --git a/Installation/cmake/modules/FindOpenGL.cmake b/Installation/cmake/modules/FindOpenGL.cmake index bdf1a80584c..49121fd6717 100644 --- a/Installation/cmake/modules/FindOpenGL.cmake +++ b/Installation/cmake/modules/FindOpenGL.cmake @@ -28,4 +28,4 @@ if ( NOT FIND_OPENGL_WRAPPER ) set(CMAKE_MODULE_PATH ${SAVED_CMAKE_MODULE_PATH} ) -endif() \ No newline at end of file +endif() From 3c3372bf600eb7aaf6778cbf1d07677396c58b27 Mon Sep 17 00:00:00 2001 From: Eric Berberich Date: Thu, 29 Mar 2012 13:44:24 +0000 Subject: [PATCH 041/102] fixes if RS3 is not available --- .../include/CGAL/RS/algebraic_1_comparisons.h | 8 ++++++++ Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h index b525c0e667a..de029659810 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_comparisons.h @@ -25,11 +25,19 @@ namespace CGAL{ +#if CGAL_USE_RS3 inline bool operator<(const Algebraic_1 &n1,const Algebraic_1 &n2){ typedef CGAL::Rsgcd_1 Gcd; return(CGAL::RS_COMPARE::compare_1(n1,n2)==SMALLER); } +#else +inline +bool operator<(const Algebraic_1 &n1,const Algebraic_1 &n2){ + typedef CGAL::Cgalgcd_1 Gcd; + return(CGAL::RS_COMPARE::compare_1(n1,n2)==SMALLER); +} +#endif inline bool operator==(const Algebraic_1 &n1,const Algebraic_1 &n2){ diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h index b5b24196bb6..9c0c02ad138 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_utils.h @@ -19,13 +19,16 @@ #ifndef CGAL_RS_POLYNOMIAL_1_UTILS_H #define CGAL_RS_POLYNOMIAL_1_UTILS_H +#include #include -#include #include #include #include #include #include +#ifdef CGAL_USE_RS3 +#include +#endif namespace CGAL{ From b573a454101f3aa965b7709576360c2effb80a6a Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Thu, 29 Mar 2012 13:46:19 +0000 Subject: [PATCH 042/102] update changes.html --- Installation/changes.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Installation/changes.html b/Installation/changes.html index 2155232a57c..2ec00580340 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -100,6 +100,16 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/
+

Release 4.1

+
+

Release date:

+ +

Combinatorial Maps

+
    +
  • Minor bugfix.
    • +
+ +

Release 4.0

Release date: March 2012

From 95bec3999cd8903229b816ecdee8d4a89facdd81 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 30 Mar 2012 12:37:19 +0000 Subject: [PATCH 044/102] Use Unique_has_map instead of std::map (patch from Andreas Fabri) The gain on copies of T2 or T3 is the following: afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3 $ ./copy 1000000 2 36.806 sec afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3 $ ./copy 1000000 2 4.865 sec The benchmarck copy.cpp is the following (not commited): #define CGAL_T3_HASH #include #include #include #include #include #include #include #include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Delaunay_triangulation_3 Delaunay; typedef K::Point_3 Point; typedef CGAL::Creator_uniform_3 Creator; int main(int argc, char **argv) { int n=1000000; int rep=100; if (argc>=2) n=atoi(argv[1]); if (argc>=3) rep=atoi(argv[2]); std::vector points; points.reserve(n); CGAL::Random_points_in_sphere_3 g(1); CGAL::copy_n( g, n, std::back_inserter(points)); Delaunay original; original.insert(points.begin(),points.end()); double res = 0; for (int r=0;r #include +#include #include #include @@ -286,7 +287,7 @@ public: Face_handle f1, Face_handle f2, Face_handle f3); - void set_adjacency(Face_handle f0, int i0, Face_handle f1, int i1) const; + void set_adjacency(Face_handle f0, int i0, Face_handle f1, int i1) const; void delete_face(Face_handle); void delete_vertex(Vertex_handle); @@ -1772,8 +1773,8 @@ copy_tds(const Tds &tds, Vertex_handle vh) if(n == 0) {return Vertex_handle();} //initializes maps - std::map vmap; - std::map fmap; + Unique_hash_map vmap; + Unique_hash_map fmap; // create vertices Vertex_iterator vit1 = tds.vertices_begin(); @@ -1825,8 +1826,9 @@ file_output( std::ostream& os, Vertex_handle v, bool skip_first) const else os << n << m << dimension(); if (n==0) return; - std::map V; - std::map F; + Unique_hash_map V; + Unique_hash_map F; + // first vertex int inum = 0; @@ -1961,7 +1963,8 @@ vrml_output( std::ostream& os, Vertex_handle v, bool skip_infinite) const os << "\t\tcoord Coordinate {" << std::endl; os << "\t\t\tpoint [" << std::endl; - std::map vmap; + Unique_hash_map vmap; + Vertex_iterator vit; Face_iterator fit; diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index a654029e7d3..c52ea6c70c5 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -1571,7 +1572,7 @@ operator<< (std::ostream& os, const Triangulation_3 &tr) CGAL_triangulation_assertion( i == n+1 ); CGAL_triangulation_assertion( tr.is_infinite(TV[0]) ); - std::map V; + Unique_hash_map V; V[tr.infinite_vertex()] = 0; for (i=1; i <= n; i++) { diff --git a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h index 5c77dbd85d5..d0ca2a9bdf4 100644 --- a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -303,7 +304,7 @@ public: std::size_t & m, std::map< std::size_t, Cell_handle > &C ); // not documented void print_cells(std::ostream& os, - const std::map &V ) const; + const Unique_hash_map &V ) const; // ACCESS FUNCTIONS @@ -1332,7 +1333,8 @@ operator<<(std::ostream& os, const Triangulation_data_structure_3 &tds) typedef typename Tds::Vertex_handle Vertex_handle; typedef typename Tds::Vertex_iterator Vertex_iterator; - std::map V; + + Unique_hash_map V; // outputs dimension and number of vertices size_type n = tds.number_of_vertices(); @@ -1915,7 +1917,7 @@ read_cells(std::istream& is, std::map< std::size_t, Vertex_handle > &V, template < class Vb, class Cb> void Triangulation_data_structure_3:: -print_cells(std::ostream& os, const std::map &V ) const +print_cells(std::ostream& os, const Unique_hash_map &V ) const { std::map C; std::size_t i = 0; @@ -1935,14 +1937,14 @@ print_cells(std::ostream& os, const std::map &V ) co C[it] = i++; for(int j = 0; j < 4; j++){ if(is_ascii(os)) { - os << V.find(it->vertex(j))->second; + os << V[it->vertex(j)]; if ( j==3 ) os << std::endl; else os << ' '; } else - write(os, V.find(it->vertex(j))->second); + write(os, V[it->vertex(j)]); } } CGAL_triangulation_assertion( i == m ); @@ -1977,14 +1979,14 @@ print_cells(std::ostream& os, const std::map &V ) co C[(*it).first] = i++; for(int j = 0; j < 3; j++){ if(is_ascii(os)) { - os << V.find((*it).first->vertex(j))->second; + os << V[(*it).first->vertex(j)]; if ( j==2 ) os << std::endl; else os << ' '; } else { - write(os, V.find((*it).first->vertex(j))->second); + write(os, V[(*it).first->vertex(j)]); } } } @@ -2020,14 +2022,14 @@ print_cells(std::ostream& os, const std::map &V ) co C[(*it).first] = i++; for(int j = 0; j < 2; j++){ if(is_ascii(os)) { - os << V.find((*it).first->vertex(j))->second; + os << V[(*it).first->vertex(j)]; if ( j==1 ) os << std::endl; else os << ' '; } else { - write(os, V.find((*it).first->vertex(j))->second); + write(os, V[(*it).first->vertex(j)]); } } } @@ -3337,8 +3339,8 @@ copy_tds(const Tds & tds, Vertex_handle vert ) CGAL_triangulation_assertion( i == n ); - std::map< Vertex_handle, Vertex_handle > V; - std::map< Cell_handle, Cell_handle > F; + Unique_hash_map V; + Unique_hash_map F; for (size_type i=0; i <= n-1; ++i) V[ TV[i] ] = create_vertex(TV[i]); From 117f427e443bcfdd849b45f7d080c05fdb91bfe4 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Fri, 30 Mar 2012 12:48:16 +0000 Subject: [PATCH 045/102] Bug fix in Color manual --- iostream/doc_tex/IOstream_ref/Color.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iostream/doc_tex/IOstream_ref/Color.tex b/iostream/doc_tex/IOstream_ref/Color.tex index dfcb870b448..d7a7fe5a077 100644 --- a/iostream/doc_tex/IOstream_ref/Color.tex +++ b/iostream/doc_tex/IOstream_ref/Color.tex @@ -8,7 +8,7 @@ \ccDefinition An object of the class \ccRefName\ is a color available for drawing operations in many \cgal\ output streams. -Each color is defined by a triple of integers $(r,g,b)$ with +Each color is defined by a triple of unsigned chars $(r,g,b)$ with $0\le r,g,b \le 255$, the so-called {\em rgb-value} of the color. \ccInclude{CGAL/IO/Color.h} @@ -28,7 +28,7 @@ $0\le r,g,b \le 255$, the so-called {\em rgb-value} of the color. \ccConstructor{Color();} {creates a color with rgb-value $(0,0,0)$, i.e.\ black.} -\ccConstructor{Color(int red, int green, int blue);} +\ccConstructor{Color(unsigned char red, unsigned char green, unsigned char blue);} {creates a color with rgb-value \ccStyle{(red,green,blue)}.} @@ -44,13 +44,13 @@ $0\le r,g,b \le 255$, the so-called {\em rgb-value} of the color. \ccMethod{bool operator!=(const Color &q) const;} {Test for inequality.} -\ccMethod{int red() const;} +\ccMethod{unsigned char red() const;} {returns the red component of \ccVar.} \ccGlue -\ccMethod{int green() const;} +\ccMethod{unsigned char green() const;} {returns the green component of \ccVar.} \ccGlue -\ccMethod{int blue() const;} +\ccMethod{unsigned char blue() const;} {returns the blue component of \ccVar.} \ccConstants From cb981fd797ce7f29ac12ae5df0f450c2aa6b9fb9 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Fri, 30 Mar 2012 15:53:30 +0000 Subject: [PATCH 046/102] Switched the Voronoi_diagram_2 license from QPL to GPLv3+ Removed the '*' from dont_submit, which means that VD2 is back into internal releases --- .../CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h | 7 ++++--- .../include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h | 7 ++++--- .../include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h | 7 ++++--- .../Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h | 7 ++++--- Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h | 7 ++++--- Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_file_toolbar.h | 7 ++++--- Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers.h | 7 ++++--- .../demo/Voronoi_diagram_2/qt_layers_toolbar.h | 7 ++++--- Voronoi_diagram_2/demo/Voronoi_diagram_2/typedefs.h | 7 ++++--- .../demo/Voronoi_diagram_2/voronoi_diagram_2.cpp | 7 ++++--- .../doc_tex/Voronoi_diagram_2/PkgDescription.tex | 2 +- .../Voronoi_diagram_2/Voronoi_diagram_adaptor_2.tex | 7 ++++--- .../Voronoi_diagram_adaptor_2_examples.tex | 7 ++++--- Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/main.tex | 7 ++++--- .../AG_caching_degeneracy_removal_policy_2.tex | 7 ++++--- .../AG_degeneracy_removal_policy_2.tex | 7 ++++--- .../doc_tex/Voronoi_diagram_2_ref/AdaptationPolicy.tex | 7 ++++--- .../doc_tex/Voronoi_diagram_2_ref/AdaptationTraits_2.tex | 7 ++++--- .../Apollonius_graph_adaptation_traits_2.tex | 7 ++++--- .../DT_caching_degeneracy_removal_policy_2.tex | 7 ++++--- .../DT_degeneracy_removal_policy_2.tex | 7 ++++--- .../doc_tex/Voronoi_diagram_2_ref/DelaunayGraph_2.tex | 7 ++++--- .../Delaunay_triangulation_adaptation_traits_2.tex | 7 ++++--- .../doc_tex/Voronoi_diagram_2_ref/Identity_policy_2.tex | 7 ++++--- .../RT_caching_degeneracy_removal_policy_2.tex | 7 ++++--- .../RT_degeneracy_removal_policy_2.tex | 7 ++++--- .../Regular_triangulation_adaptation_traits_2.tex | 7 ++++--- .../SDG_caching_degeneracy_removal_policy_2.tex | 7 ++++--- .../SDG_degeneracy_removal_policy_2.tex | 7 ++++--- .../Segment_Delaunay_graph_adaptation_traits_2.tex | 7 ++++--- .../doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramFace_2.tex | 7 ++++--- .../Voronoi_diagram_2_ref/VoronoiDiagramHalfedge_2.tex | 7 ++++--- .../Voronoi_diagram_2_ref/VoronoiDiagramVertex_2.tex | 7 ++++--- .../Voronoi_diagram_2_ref/Voronoi_diagram_adaptor_2.tex | 7 ++++--- Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/intro.tex | 7 ++++--- Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/main.tex | 7 ++++--- Voronoi_diagram_2/dont_submit | 1 - .../include/CGAL/Apollonius_graph_adaptation_policies_2.h | 7 ++++--- .../include/CGAL/Apollonius_graph_adaptation_traits_2.h | 7 ++++--- .../CGAL/Delaunay_triangulation_adaptation_policies_2.h | 7 ++++--- .../CGAL/Delaunay_triangulation_adaptation_traits_2.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Identity_policy_2.h | 7 ++++--- .../CGAL/Regular_triangulation_adaptation_policies_2.h | 7 ++++--- .../CGAL/Regular_triangulation_adaptation_traits_2.h | 7 ++++--- .../CGAL/Segment_Delaunay_graph_adaptation_policies_2.h | 7 ++++--- .../CGAL/Segment_Delaunay_graph_adaptation_traits_2.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Accessor.h | 7 ++++--- .../CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h | 7 ++++--- .../CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h | 7 ++++--- .../Apollonius_graph_degeneracy_testers.h | 7 ++++--- .../Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h | 7 ++++--- .../CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Connected_components.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Construct_dual_points.h | 7 ++++--- .../CGAL/Voronoi_diagram_2/Default_site_inserters.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Default_site_removers.h | 7 ++++--- .../CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h | 7 ++++--- .../Delaunay_triangulation_degeneracy_testers.h | 7 ++++--- .../Delaunay_triangulation_nearest_site_2.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Dummy_iterator.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Edge_less.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Finder_classes.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Halfedge.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Handle_adaptor.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Identity_rejectors.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Policy_base.h | 7 ++++--- .../Regular_triangulation_degeneracy_testers.h | 7 ++++--- .../Regular_triangulation_nearest_site_2.h | 7 ++++--- .../Segment_Delaunay_graph_degeneracy_testers.h | 7 ++++--- .../Segment_Delaunay_graph_nearest_site_2.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Site_accessors.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Unbounded_edges.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Unbounded_faces.h | 7 ++++--- .../include/CGAL/Voronoi_diagram_2/Validity_testers.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/basic.h | 7 ++++--- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h | 7 ++++--- .../Voronoi_diagram_2/include/Adaptation_policy_concept.h | 7 ++++--- .../Voronoi_diagram_2/include/Adaptation_traits_concept.h | 7 ++++--- .../Voronoi_diagram_2/include/Delaunay_graph_concept.h | 7 ++++--- .../test/Voronoi_diagram_2/include/helper_functions.h | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h | 7 ++++--- .../test/Voronoi_diagram_2/include/vda_print_report.h | 7 ++++--- .../test/Voronoi_diagram_2/include/vda_test.h | 7 ++++--- .../test/Voronoi_diagram_2/include/vda_test_concept.h | 7 ++++--- .../test/Voronoi_diagram_2/include/vda_test_locate.h | 7 ++++--- .../test/Voronoi_diagram_2/include/vda_test_vda.h | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp | 7 ++++--- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp | 7 ++++--- 96 files changed, 377 insertions(+), 284 deletions(-) diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h index 80759dc9124..f6bf4079263 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h index 62db0e93e67..f56a5f9bceb 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h index 64ad90c176d..571af99449e 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h index 60311f39346..8b9a2428400 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h index 8e9940ec2ff..51a1d9f151c 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_file_toolbar.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_file_toolbar.h index 0c6dc16627a..12cde0d7c0a 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_file_toolbar.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_file_toolbar.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers.h index 30b76b9fdbb..d06515f3c54 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers_toolbar.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers_toolbar.h index 152abbbfa59..0830020e1d4 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers_toolbar.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/qt_layers_toolbar.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/typedefs.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/typedefs.h index 399f419419e..82c51fce4c5 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/typedefs.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/typedefs.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp b/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp index 337178b2f77..51333388068 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/PkgDescription.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/PkgDescription.tex index 34dc4f98293..415839acec7 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/PkgDescription.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/PkgDescription.tex @@ -15,7 +15,7 @@ Voronoi diagrams and can support point location queries. } % %\ccPkgDependsOn{} \ccPkgIntroducedInCGAL{3.2} -\ccPkgLicense{\ccLicenseQPL} +\ccPkgLicense{\ccLicenseGPL} \ccPkgDemo{2D Point Voronoi Diagram }{delaunay_triangulation_2.zip} \ccPkgDemo{2D Disk Voronoi Diagram}{apollonius_graph_2.zip} \ccPkgDemo{2D Segment Voronoi Diagram}{segment_voronoi_diagram_2.zip} diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2.tex index 4921b3dd6d5..af947fcbede 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex index 75cdbf90da9..c7cd3b4896d 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/main.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/main.tex index a681f479cc3..c4e17c431de 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/main.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/main.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_caching_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_caching_degeneracy_removal_policy_2.tex index 666b8437f9a..38089a2ff08 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_caching_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_caching_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_degeneracy_removal_policy_2.tex index b4f7ae90a04..021361f1cf9 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AG_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationPolicy.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationPolicy.tex index b9e42725f00..64b08967c87 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationPolicy.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationPolicy.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationTraits_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationTraits_2.tex index 36f21ca40f2..0f3fbf1fb07 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationTraits_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/AdaptationTraits_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Apollonius_graph_adaptation_traits_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Apollonius_graph_adaptation_traits_2.tex index ab320f454b0..eb6614ee6e6 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Apollonius_graph_adaptation_traits_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Apollonius_graph_adaptation_traits_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_caching_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_caching_degeneracy_removal_policy_2.tex index 4900d275b95..5dfb209543d 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_caching_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_caching_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_degeneracy_removal_policy_2.tex index a41bd05b92a..fafd6132208 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DT_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DelaunayGraph_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DelaunayGraph_2.tex index 29ca2153c06..e568339412d 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DelaunayGraph_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/DelaunayGraph_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Delaunay_triangulation_adaptation_traits_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Delaunay_triangulation_adaptation_traits_2.tex index 5e3249c9668..23a6b91d289 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Delaunay_triangulation_adaptation_traits_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Delaunay_triangulation_adaptation_traits_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Identity_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Identity_policy_2.tex index 8e4874b965c..cd32ab52f5b 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Identity_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Identity_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_caching_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_caching_degeneracy_removal_policy_2.tex index 71c6b7c2df1..210b8ada3b7 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_caching_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_caching_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_degeneracy_removal_policy_2.tex index 1bb32d2e64e..f33682a4f5c 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/RT_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Regular_triangulation_adaptation_traits_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Regular_triangulation_adaptation_traits_2.tex index 1153f8018e9..ff702c23c70 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Regular_triangulation_adaptation_traits_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Regular_triangulation_adaptation_traits_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_caching_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_caching_degeneracy_removal_policy_2.tex index 5163ccccb3a..1516b5a7550 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_caching_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_caching_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_degeneracy_removal_policy_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_degeneracy_removal_policy_2.tex index a494b720da8..2a45f4617f7 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_degeneracy_removal_policy_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/SDG_degeneracy_removal_policy_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Segment_Delaunay_graph_adaptation_traits_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Segment_Delaunay_graph_adaptation_traits_2.tex index d537f93bbd1..6f9ef2e972e 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Segment_Delaunay_graph_adaptation_traits_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Segment_Delaunay_graph_adaptation_traits_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramFace_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramFace_2.tex index 35b8b921b69..7dcc3821871 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramFace_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramFace_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramHalfedge_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramHalfedge_2.tex index 4e602ab9721..a12241901de 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramHalfedge_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramHalfedge_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramVertex_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramVertex_2.tex index 1bb7650d2cd..0be9a7447fd 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramVertex_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/VoronoiDiagramVertex_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Voronoi_diagram_adaptor_2.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Voronoi_diagram_adaptor_2.tex index 1d0d46587c9..2481da7df63 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Voronoi_diagram_adaptor_2.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/Voronoi_diagram_adaptor_2.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/intro.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/intro.tex index b099dc63261..1733687aa69 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/intro.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/intro.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/main.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/main.tex index 86d1866a086..60c5e1eb198 100644 --- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/main.tex +++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2_ref/main.tex @@ -1,9 +1,10 @@ %% Copyright (c) 2005 Foundation for Research and Technology-Hellas (Greece). %% All rights reserved. %% -%% This file is part of CGAL (www.cgal.org); you may redistribute it under -%% the terms of the Q Public License version 1.0. -%% See the file LICENSE.QPL distributed with CGAL. +%% This file is part of CGAL (www.cgal.org). +%% You can redistribute it and/or modify it under the terms of the GNU +%% General Public License as published by the Free Software Foundation, +%% either version 3 of the License, or (at your option) any later version. %% %% Licensees holding a valid commercial license may use this file in %% accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/dont_submit b/Voronoi_diagram_2/dont_submit index bb01263ef21..1549b67ca59 100644 --- a/Voronoi_diagram_2/dont_submit +++ b/Voronoi_diagram_2/dont_submit @@ -1,2 +1 @@ -* demo diff --git a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h index 273f6494129..6318d79ab20 100644 --- a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h index 9ac4e325845..0f994a387cb 100644 --- a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h index 6f6b89de42f..c6cddc13022 100644 --- a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h index f1fe9a900ab..a8f2b71a4b6 100644 --- a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h b/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h index 8b6cad12913..2ada2658229 100644 --- a/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h +++ b/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h index 0588f07358a..d1ed0add3b4 100644 --- a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h index e3c32bb2651..f3eec2ad2df 100644 --- a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h index 310d197957a..848bcbbb87d 100644 --- a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h index 627ed220e34..56370de83ee 100644 --- a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h index 7293b86abfe..4fc82e351e2 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h index 66864ebab81..d2bf8c98fe1 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h index 09c856c8edf..a552a00b629 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h index 63ad6a286ee..ed02ee7ed0e 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h index 9a83c92b1dd..d1ec214805c 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h index f59ad11d849..4d834d41a3b 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h index 88e9a82ceb7..fd3b8d10d45 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h index 5ee44dcac31..fa5e9cc11ae 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h index 64a1e1dda0c..ca19888e2b2 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h index 9ee77ea2728..2b3957e98d9 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h index f0053b0d013..b73075eea4d 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h index 647f7ca85f0..593f7632c69 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h index 564e4e8517f..1aeef798020 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h index 127a213323c..87ad86bdb4c 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h index 412822080b5..887302005b0 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h index b13246cfbb6..a09d5d2faeb 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h index 2613340a7ed..00292a2233e 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h index 7ae58d0688d..c307bbae43d 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h index 1dd8c7f2ac4..c0f3923c00d 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h index 2f28dd025a9..2d06e6c995e 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h index 7b79a2cd91d..e57f07a8f01 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h index 244e300cbbd..bf06534830b 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h index f4167435278..468c23956e8 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h index 1ddd1737691..746142ef859 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h index a0666497f43..df005764930 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h index d57185d96aa..a512b530127 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h index a7dc102cf10..89d6b798007 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h index 9d04b7daab5..05ac879994a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h index a4cdd8c259c..26f92013602 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h index a10c9a4e1df..3c41707d13a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h index b0c02b7f885..a08ba6786f2 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h index 663253d62d5..6d002f45536 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h index 0bece4fe2ee..8d8ff272372 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/basic.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/basic.h index 362451c118e..eff7f6fcf7a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/basic.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/basic.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h index ef0335b94d1..a62aadb6d87 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h index 1e91b21c5f5..3e760c786af 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h index 16d39221101..d1b858f1563 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h index 5f287173fc2..5924817fcaf 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/helper_functions.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/helper_functions.h index 02fc151f3a5..2666c4e7787 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/helper_functions.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/helper_functions.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h index 9941952d1fc..717e93c04ce 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h index 7bc20181bc8..c5a4d8e0f8e 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h index fd917398f99..4fe271ae573 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_concept.h index e70f7a806d1..b115d0a900b 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_concept.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h index a2d31ac4c28..d0b261bc29e 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h index 2fce6dcc140..90c268a7fcc 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp index a87ae730f81..2a93b2b690f 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp index 7a7884407bb..87a908f9122 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp index a9746b965c6..3c648dbccf7 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp index d877dbffe44..ef440b529cc 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp index 78c702db1c3..59d96957584 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp @@ -1,9 +1,10 @@ // Copyright (c) 2006 Foundation for Research and Technology-Hellas (Greece). // All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From afbb0e161cf587a34f109d9de3fd3a7d230e2427 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 30 Mar 2012 16:00:11 +0000 Subject: [PATCH 047/102] Vd_2 is under GPLv3+. That is the new result of Scripts/developer_scripts/detect_packages_licenses --- Voronoi_diagram_2/package_info/Voronoi_diagram_2/license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Voronoi_diagram_2/package_info/Voronoi_diagram_2/license.txt b/Voronoi_diagram_2/package_info/Voronoi_diagram_2/license.txt index 27588bc0103..0d3d7e59728 100644 --- a/Voronoi_diagram_2/package_info/Voronoi_diagram_2/license.txt +++ b/Voronoi_diagram_2/package_info/Voronoi_diagram_2/license.txt @@ -1 +1 @@ -QPL +GPL (v3 or later) From 6a560629d291535203cb1a16f349b27c877a425d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 2 Apr 2012 13:08:57 +0000 Subject: [PATCH 048/102] Adapt Periodic_3 to the new API of TDS_3::print_cells. --- .../include/CGAL/Periodic_3_triangulation_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index 1cccf2dd8da..0d93bc25728 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -3583,7 +3583,7 @@ operator<< (std::ostream& os,const Periodic_3_triangulation_3 &tr) return os; // write the vertices - std::map V; + Unique_hash_map V; std::size_t i=0; if (tr.is_1_cover()) { for (Vertex_iterator it=tr.vertices_begin(); it!=tr.vertices_end(); ++it) { From 348d51bde3ac2719a94b643dd8a3fadd83e35d59 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 2 Apr 2012 13:15:50 +0000 Subject: [PATCH 049/102] Fill svn:ignore properties --- .gitignore | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.gitignore b/.gitignore index 451529c1056..b139acc03b4 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ CGALimageIO/demo/CGALimageIO/cmake_install.cmake CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer CGALimageIO/examples/CGALimageIO/*.exe CGALimageIO/examples/CGALimageIO/Makefile +CGALimageIO/examples/CGALimageIO/cgal_test_with_cmake CGALimageIO/examples/CGALimageIO/convert_raw_image_to_inr CGALimageIO/examples/CGALimageIO/makefile CGALimageIO/examples/CGALimageIO/test_imageio @@ -163,6 +164,9 @@ Installation/auxiliary/gdb/test Installation/cmake/modules/*.tmp Installation/test/Installation/cgal_test Installation/test/Installation/deprecation_warning +Interpolation/demo/Interpolation/cgal_test_with_cmake +Intersections_3/test/Intersections_3/CMakeLists.txt +Intersections_3/test/Intersections_3/bbox_other_do_intersect_test Jet_fitting_3/examples/Jet_fitting_3/*.exe Jet_fitting_3/examples/Jet_fitting_3/*.sln Jet_fitting_3/examples/Jet_fitting_3/*.vcproj @@ -570,6 +574,7 @@ Mesh_3/examples/Mesh_3/*.png Mesh_3/examples/Mesh_3/.*.deps Mesh_3/examples/Mesh_3/Makefile Mesh_3/examples/Mesh_3/applications +Mesh_3/examples/Mesh_3/cgal_test_with_cmake Mesh_3/examples/Mesh_3/cgal_to_medit Mesh_3/examples/Mesh_3/chair-after.mesh Mesh_3/examples/Mesh_3/chair-after.png @@ -585,6 +590,16 @@ Mesh_3/examples/Mesh_3/implicit_surfaces_mesher_3 Mesh_3/examples/Mesh_3/lanteri Mesh_3/examples/Mesh_3/lanteri_output_tet_mesh Mesh_3/examples/Mesh_3/medit_to_cgal +Mesh_3/examples/Mesh_3/mesh_3D_gray_image +Mesh_3/examples/Mesh_3/mesh_3D_image +Mesh_3/examples/Mesh_3/mesh_3D_image_variable_size +Mesh_3/examples/Mesh_3/mesh_implicit_sphere +Mesh_3/examples/Mesh_3/mesh_implicit_sphere_variable_size +Mesh_3/examples/Mesh_3/mesh_optimization_example +Mesh_3/examples/Mesh_3/mesh_optimization_lloyd_example +Mesh_3/examples/Mesh_3/mesh_polyhedral_domain +Mesh_3/examples/Mesh_3/mesh_polyhedral_domain_with_features +Mesh_3/examples/Mesh_3/mesh_two_implicit_spheres_with_balls Mesh_3/examples/Mesh_3/my_makefile Mesh_3/examples/Mesh_3/off_to_ghs Mesh_3/examples/Mesh_3/out*.mesh.* @@ -685,6 +700,8 @@ Min_ellipse_2/.tmp Min_ellipse_2/Makefile Min_ellipse_2/bin Min_ellipse_2/doc_ps +Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt +Minkowski_sum_3/test/Minkowski_sum_3/cgal_test_with_cmake Modular_arithmetic/doc_html Modular_arithmetic/doc_pdf Modular_arithmetic/doc_ps @@ -966,6 +983,9 @@ Ridges_3/test/Ridges_3/*.sln Ridges_3/test/Ridges_3/*.vcproj Ridges_3/test/Ridges_3/Makefile Ridges_3/test/Ridges_3/ridge_test +STL_Extension/test/STL_Extension/CMakeLists.txt +STL_Extension/test/STL_Extension/cgal_test_with_cmake +STL_Extension/test/STL_Extension/test_nth_element Skin_surface_3/.cdtproject Skin_surface_3/.project Skin_surface_3/.settings @@ -978,6 +998,8 @@ Skin_surface_3/test/Skin_surface_3/error.txt Skin_surface_3/test/Skin_surface_3/makefile Skin_surface_3/test/Skin_surface_3/msgs.txt Skin_surface_3/test/Skin_surface_3/subdivision_test +Spatial_sorting/test/Spatial_sorting/CMakeLists.txt +Spatial_sorting/test/Spatial_sorting/cgal_test_with_cmake Stream_lines_2/demo/Stream_lines_2/*.exe Stream_lines_2/demo/Stream_lines_2/*.sln Stream_lines_2/demo/Stream_lines_2/*.vcproj @@ -1186,12 +1208,17 @@ Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/error.txt Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/poisson_reconstruction_test Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/release Testsuite/test/myrun_testsuite_with_cmake +Triangulation_2/CMakeLists.txt +Triangulation_2/cgal_test_with_cmake Triangulation_2/demo/Triangulation_2/*.exe Triangulation_2/demo/Triangulation_2/Makefile Triangulation_2/demo/Triangulation_2/constrained Triangulation_2/demo/Triangulation_2/constrained_delaunay_triangulation_2 Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2 Triangulation_2/demo/Triangulation_2/regular_triangulation_2 +Triangulation_2/examples/Triangulation_2/CMakeLists.txt +Triangulation_2/examples/Triangulation_2/cgal_test_with_cmake +Triangulation_2/examples/Triangulation_2/regular Triangulation_2/test/Triangulation_2/*.exe Triangulation_2/test/Triangulation_2/CMakeLists.txt Triangulation_2/test/Triangulation_2/Makefile @@ -1212,6 +1239,9 @@ Triangulation_2/test/Triangulation_2/test_triangulation_2_bis Triangulation_2/test/Triangulation_2/test_triangulation_geom_traits Triangulation_2/test/Triangulation_2/test_triangulation_tds Triangulation_2/test/Triangulation_2/vrml_tds* +Triangulation_3/benchmark/Triangulation_3/CMakeLists.txt +Triangulation_3/benchmark/Triangulation_3/cgal_test_with_cmake +Triangulation_3/benchmark/Triangulation_3/simple Triangulation_3/examples/Triangulation_3/*.exe Triangulation_3/examples/Triangulation_3/CMakeLists.txt Triangulation_3/examples/Triangulation_3/adding_handles_3 @@ -1247,6 +1277,7 @@ Triangulation_3/test/Triangulation_3/makefile Triangulation_3/test/Triangulation_3/test_delaunay_3 Triangulation_3/test/Triangulation_3/test_delaunay_hierarchy_3 Triangulation_3/test/Triangulation_3/test_delaunay_hierarchy_3_old +Triangulation_3/test/Triangulation_3/test_dt_deterministic_3 Triangulation_3/test/Triangulation_3/test_regular_3 Triangulation_3/test/Triangulation_3/test_regular_as_delaunay_3 Triangulation_3/test/Triangulation_3/test_regular_remove_3 From e4dba3f327966bc3d4e92648a58b655315bd0098 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 4 Apr 2012 15:43:16 +0000 Subject: [PATCH 050/102] Fix the computation of md5sum --- Maintenance/public_release/scripts/prepare_release | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Maintenance/public_release/scripts/prepare_release b/Maintenance/public_release/scripts/prepare_release index 1dba21cf2d2..18b2c46ddcb 100755 --- a/Maintenance/public_release/scripts/prepare_release +++ b/Maintenance/public_release/scripts/prepare_release @@ -61,8 +61,10 @@ popd printf "Untar examples/ and include/ for rsync to the server\n" tar xf "$DEST_DIR/${PUBLIC_RELEASE_NAME}.tar.gz" --strip-components 1 "${PUBLIC_RELEASE_NAME}"/examples "${PUBLIC_RELEASE_NAME}"/include -C "$DEST_DIR" +pushd "${DEST_DIR}" printf "Compute md5sum.txt..." md5sum *.^txt > md5sum.txt +popd printf "Now use:\n" printf " cd ${DEST_DIR}\n" From 9f2c46210ec68467ec2adac839281ae74d657ccb Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 5 Apr 2012 10:25:25 +0000 Subject: [PATCH 051/102] svn:ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b139acc03b4..d7ca6c48ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ Installation/test/Installation/deprecation_warning Interpolation/demo/Interpolation/cgal_test_with_cmake Intersections_3/test/Intersections_3/CMakeLists.txt Intersections_3/test/Intersections_3/bbox_other_do_intersect_test +Intersections_3/test/Intersections_3/cgal_test_with_cmake Jet_fitting_3/examples/Jet_fitting_3/*.exe Jet_fitting_3/examples/Jet_fitting_3/*.sln Jet_fitting_3/examples/Jet_fitting_3/*.vcproj @@ -508,6 +509,8 @@ Mesh_2/doc_tex/Mesh_2_ref/semantic.cache Mesh_2/doxygen Mesh_2/examples/Mesh_2/*.core Mesh_2/examples/Mesh_2/.*.deps +Mesh_2/examples/Mesh_2/CMakeLists.txt +Mesh_2/examples/Mesh_2/cgal_test_with_cmake Mesh_2/examples/Mesh_2/conform Mesh_2/examples/Mesh_2/conforming Mesh_2/examples/Mesh_2/depends From 8db3036330638319ba0be46f51dea40f83dc79f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 5 Apr 2012 11:57:58 +0000 Subject: [PATCH 052/102] BUGFIX correct error in intersection computation of triangle_3 segment_3 when the segment is collinear with a triangle edge. --- .../Triangle_3_Segment_3_intersection.h | 32 ++++++++++++------- .../triangle_other_intersection_test.cpp | 7 +++- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h index 86c83351dfe..841499dd6c1 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h @@ -156,26 +156,36 @@ t3s3_intersection_collinear_aux(const typename K::Point_3& a, typename K::Equal_3 equals = k.equal_3_object(); - // possible orders: [p,a,b,q], [p,a,q,b], [a,p,b,q], [a,p,q,b] - if ( collinear_ordered(p,a,q) ) + // possible orders: [p,a,b,q], [p,a,q,b], [p,q,a,b], [a,p,b,q], [a,p,q,b], [a,b,p,q] + if ( collinear_ordered(p,a,b) ) { // p is before a - if ( collinear_ordered(p,b,q) ) - return make_object(segment(a,b)); - else - return equals(a,q)? - make_object(a): - make_object(segment(a,q)); + //possible orders: [p,a,b,q], [p,a,q,b], [p,q,a,b] + if ( collinear_ordered(a,b,q) ) + return make_object(segment(a,b)); //[p,a,b,q] + else{ + if ( collinear_ordered(q,a,b) ) + return equals(a,q)? //[p,q,a,b] + make_object(a): + Object(); + return make_object(segment(a,q)); //[p,a,q,b] + } } else { // p is after a + //possible orders: [a,p,b,q], [a,p,q,b], [a,b,p,q] if ( collinear_ordered(p,b,q) ) - return equals(p,b)? + return equals(p,b)? // [a,p,b,q] make_object(p): make_object(segment(p,b)); - else - return make_object(segment(p,q)); + else{ + if ( collinear_ordered(a,b,p) ) + return equals(p,b)? // [a,b,p,q] + make_object(p): + Object(); + return make_object(segment(p,q)); // [a,p,q,b] + } } } diff --git a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp index 57036f2e574..016e772b0b5 100644 --- a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp +++ b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp @@ -622,7 +622,12 @@ int main() std::cout << "\tTesting with Exact_predicates_exact_constructions_kernel..." << std::endl ; b &= test(); - + //test with a coplanar segment + b &= CGAL::intersection( + Epec::Segment_3(Epec::Point_3(0.125, 0, -0.125),Epec::Point_3(0.25, 0, -0.125) ), + Epec::Triangle_3( Epec::Point_3(0.2500001, 0, -0.125), + Epec::Point_3(1.0278171, 0, -0.125) /* vertex 10*/, + Epec::Point_3(1.0278171, 0, -0.250001) /* vertex 9*/ ) ).empty(); // ----------------------------------- // Test random intersection // ----------------------------------- From 60e014850497bd1739b7010a980e5a4ae132d41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 5 Apr 2012 12:43:15 +0000 Subject: [PATCH 053/102] update changes.html --- Installation/changes.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Installation/changes.html b/Installation/changes.html index 2ec00580340..bd4d957c22b 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -109,6 +109,20 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/
  • Minor bugfix.
    • +

    Release 4.0.1

    + +
    +

    Release date: April 2012

    + +

    +This is a bug fix release. The following has been changed +since CGAL-4.0:

    + +

    2D and 3D Geometry Kernel

    +
      +
    • Fix a bug in the Segment_3-Triangle_3 intersection function in the case the segment is collinear with a triangle edge..
      • +
    +

    Release 4.0

    From eb52def3db6e40c33c341f6f8609ceab0b962220 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 10 Apr 2012 12:08:05 +0000 Subject: [PATCH 054/102] Restore indentation (one line) after a modification by a Windows developer --- Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h index 0cb45915c6b..9592d6ff773 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h @@ -172,7 +172,7 @@ public: /// Job to do after insertion void after_insertion_impl(const Vertex_handle& v) - { restore_restricted_Delaunay(v); } + { restore_restricted_Delaunay(v); } /// Insert p into triangulation Vertex_handle insert_impl(const Point& p, const Zone& zone); From bbee79552ee0d8c2e2bc799a87eaa0ebaceaa4c7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 13:37:13 +0000 Subject: [PATCH 055/102] Update the script that recompiles my Boost libraries. - Only one variant: multithread, shared, release, with the tagged layout, so that the soname ends with "-mt.so", - and do not compile all Boost libraries. --- .../boost/compile-boost | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost index 07f4ef4fa3b..40e95879553 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost @@ -1,6 +1,15 @@ -./bjam toolset=gcc-4.6.2 -./bjam toolset=gcc-cxxdebug --stagedir=stage-cxxdebug +#!/bin/sh + +OPTS="-j4 --layout=tagged link=shared variant=release threading=multi" +OPTS="$OPTS --without-python --without-test --without-mpi --without-wave --without-graph_parallel" + +BJAM=./bjam +if [ ! -x $BJAM ]; then + BJAM=bjam +fi + +"$BJAM" $OPTS toolset=gcc-4.6.3 +"$BJAM" --stagedir=stage-cxxdebug $OPTS toolset=gcc-cxxdebug source ~/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup -./bjam toolset=intel --stagedir=stage-intel cxxflags="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8" - +"$BJAM" --stagedir=stage-intel $OPTS toolset=intel cxxflags="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8" From e8be56654c28824d37d254dc0aa13c364cd23b87 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 13:37:35 +0000 Subject: [PATCH 056/102] Fix the BibTeX entry for Arr_2. --- Manual/doc_tex/Manual/manual-4.0.bib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Manual/doc_tex/Manual/manual-4.0.bib b/Manual/doc_tex/Manual/manual-4.0.bib index f597560448e..72268a57672 100644 --- a/Manual/doc_tex/Manual/manual-4.0.bib +++ b/Manual/doc_tex/Manual/manual-4.0.bib @@ -307,7 +307,7 @@ } @incollection{cgal:wfzh-a2-12 -, author = "Ron Wein and Efi Fogel and Baruch Zukerman and Dan Halperin" +, author = "Ron Wein and Eric Berberich and Efi Fogel and Dan Halperin and Michael Hemmer and Oren Salzman and Baruch Zukerman" , title = "{2D} Arrangements" , publisher = "{CGAL Editorial Board}" , edition = "{4.0}" From 1806c94493cefccfac07c5a0bd7fd1844062de30 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 14:58:00 +0000 Subject: [PATCH 057/102] Re-run 'cmake .' in all reference platforms directories --- .../CMakeCache.txt | 19 ++- .../CMakeCache.txt | 19 ++- .../CMakeCache.txt | 100 +++++++++--- .../CMakeCache.txt | 100 +++++++++--- .../CMakeCache.txt | 23 ++- .../CMakeCache.txt | 100 +++++++++--- .../CMakeCache.txt | 151 ++++++++++++++---- .../CMakeCache.txt | 84 +++++++--- .../CMakeCache.txt | 100 +++++++++--- .../CMakeCache.txt | 100 +++++++++--- .../CMakeCache.txt | 86 +++++++--- .../CMakeCache.txt | 17 +- 12 files changed, 702 insertions(+), 197 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt index 38aacb0608a..6faa9e8df6f 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt @@ -17,6 +17,9 @@ //Build shared libraries BUILD_SHARED_LIBS:BOOL=ON +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch @@ -993,6 +996,12 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1178,7 +1187,7 @@ Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1 @@ -1363,7 +1372,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=6 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1490,7 +1499,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -w1 -O3 +CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3 //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1988,6 +1997,10 @@ X11_SM_LIB-ADVANCED:INTERNAL=1 X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XSync_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt index 81a59e476e1..ef1c5cb9aa9 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt @@ -17,6 +17,9 @@ //Build shared libraries BUILD_SHARED_LIBS:BOOL=ON +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch @@ -993,6 +996,12 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1178,7 +1187,7 @@ Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1 @@ -1363,7 +1372,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=6 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1490,7 +1499,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -w1 -O3 +CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3 //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1988,6 +1997,10 @@ X11_SM_LIB-ADVANCED:INTERNAL=1 X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XSync_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt index 69f54188f2a..c68e9550703 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING= -std=c++0x -frounding-math //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; @@ -103,25 +115,25 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpf CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -203,6 +215,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1037,6 +1052,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1046,9 +1064,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1127,6 +1154,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1219,7 +1252,9 @@ Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib;/home/lrineau/CGAL/boost/1.44-beta1/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1253,6 +1288,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=TRUE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=TRUE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=TRUE @@ -1277,6 +1315,9 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=TRUE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=TRUE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=TRUE @@ -1335,7 +1376,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1357,8 +1398,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT @@ -1392,13 +1433,13 @@ CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //MODIFIED property for variable: CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE-MODIFIED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1453,6 +1494,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1525,6 +1568,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL=-std=c++0x -frounding-math //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1532,9 +1576,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2060,14 +2104,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2120,6 +2172,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt index 38a7513fa9a..c1f2f4085f9 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.45/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING= -frounding-math //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so; @@ -115,25 +127,25 @@ CGAL_PDB_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platform CGAL_PDB_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALPDB //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -215,6 +227,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1058,6 +1073,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1067,9 +1085,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1148,6 +1175,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1240,7 +1273,9 @@ Boost_VERSION:INTERNAL=104500 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.45/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.45/lib;/home/lrineau/CGAL/boost/1.45/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.45/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1274,6 +1309,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE @@ -1298,6 +1336,9 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE @@ -1356,7 +1397,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1378,8 +1419,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_PDB_3RD_PARTY_DEFINITIONS:INTERNAL= @@ -1419,13 +1460,13 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1480,6 +1521,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1552,6 +1595,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL= -frounding-math //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1559,9 +1603,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2091,14 +2135,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2151,6 +2203,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt index 559545efd90..456a71335af 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt @@ -17,6 +17,9 @@ //Build shared libraries BUILD_SHARED_LIBS:BOOL=ON +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch @@ -378,16 +381,16 @@ QT_PHONONWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_PHONONWIDGETS_PLUGIN_DEBUG-NOTFOUND QT_PHONONWIDGETS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libphononwidgets.so //Path to a file. -QT_PHONON_INCLUDE_DIR:PATH=QT_PHONON_INCLUDE_DIR-NOTFOUND +QT_PHONON_INCLUDE_DIR:PATH=/usr/include/phonon //The Qt PHONON library -QT_PHONON_LIBRARY:STRING= +QT_PHONON_LIBRARY:STRING=/usr/lib64/libphonon.so //Path to a library. QT_PHONON_LIBRARY_DEBUG:FILEPATH=QT_PHONON_LIBRARY_DEBUG-NOTFOUND //Path to a library. -QT_PHONON_LIBRARY_RELEASE:FILEPATH=QT_PHONON_LIBRARY_RELEASE-NOTFOUND +QT_PHONON_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libphonon.so //Path to a library. QT_PHONON_QT7_PLUGIN_DEBUG:FILEPATH=QT_PHONON_QT7_PLUGIN_DEBUG-NOTFOUND @@ -983,6 +986,12 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1163,7 +1172,7 @@ Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 @@ -1346,7 +1355,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=6 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1955,6 +1964,10 @@ X11_SM_LIB-ADVANCED:INTERNAL=1 X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XSync_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt index 515c3cf996e..ff13cd80c07 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING= -frounding-math -DCGAL_CFG_MATCHING_BUG_6 //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; @@ -103,25 +115,25 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpf CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -203,6 +215,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1037,6 +1052,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1046,9 +1064,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1127,6 +1154,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1219,7 +1252,9 @@ Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib;/home/lrineau/CGAL/boost/1.44-beta1/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1253,6 +1288,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE @@ -1277,6 +1315,9 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE @@ -1335,7 +1376,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1357,8 +1398,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT @@ -1392,13 +1433,13 @@ CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //MODIFIED property for variable: CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE-MODIFIED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1453,6 +1494,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1522,6 +1565,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL= -frounding-math -DCGAL_CFG_MATCHING_BUG_6 //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1529,9 +1573,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2057,14 +2101,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2117,6 +2169,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt index 0f1afd538c9..aa1cdaa0b15 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/usr/include @@ -30,22 +36,28 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libboost_thread-mt.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF + +//Directory containing the Core package +CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //User-defined flags CGAL_CXX_FLAGS:STRING= -frounding-math -std=c++98 -Wall -pedantic-errors -Wno-long-long -fdiagnostics-show-option //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/CGALCore +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; //Value Computed by CMake -CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALCore +CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore //Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS. // When this is FALSE, all the CMAKE_*_FLAGS flags are overriden @@ -54,6 +66,9 @@ CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALCore // TRUE. CGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=TRUE +//Directory containing the Installation package +CGAL_INSTALLATION_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I + //The folder where CGAL user-side scripts will be installed, relative // to CMAKE_INSTALL_PREFIX CGAL_INSTALL_BIN_DIR:STRING=bin @@ -64,7 +79,7 @@ CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL //The folder where CGAL documentation and license files will be // installed, relative to CMAKE_INSTALL_PREFIX -CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-3.8.1-I +CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-I //The folder where CGAL header files will be installed, relative // to CMAKE_INSTALL_PREFIX @@ -79,20 +94,26 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/CGALimageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake -CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALimageIO +CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO + +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; +//Directory containing the Maintenance package +CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I + //Value Computed by CMake CGAL_PDB_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/CGALPDB @@ -103,37 +124,37 @@ CGAL_PDB_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.ge CGAL_PDB_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; //Value Computed by CMake -CGAL_PDB_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALPDB +CGAL_PDB_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALPDB //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/CGALQt +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt3.so //Dependencies for the target CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake -CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALQt +CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/CGALQt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt4.so //Dependencies for the target CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake -CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I/src/CGALQt4 +CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 //soname-version CGAL_SONAME_VERSION:STRING=3 //Value Computed by CMake -CGAL_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-3.8.1-I +CGAL_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I //soversion CGAL_SOVERSION:STRING=3.0.0 @@ -206,6 +227,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1034,6 +1058,15 @@ WITH_GMPXX:BOOL=ON //Use the LEDA number types if available. WITH_LEDA:BOOL=OFF +//Use MPFI if available. +WITH_MPFI:BOOL=OFF + +//Use NTL if available. +WITH_NTL:BOOL=OFF + +//Use RS if available. +WITH_RS:BOOL=OFF + //Select demos WITH_demos:BOOL=OFF @@ -1046,6 +1079,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1055,9 +1091,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1136,6 +1181,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1228,7 +1279,9 @@ Boost_VERSION:INTERNAL=103700 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/usr/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/usr/lib64/libboost_thread-mt.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/usr/lib64;/usr/lib64 +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/usr/lib64 +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=FALSE @@ -1265,6 +1318,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE @@ -1289,9 +1345,15 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_STATIC_ASSERT:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_STATIC_ASSERT_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_TUPLE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_TUPLE_COMPILED:INTERNAL=FALSE @@ -1334,12 +1396,20 @@ CGAL_CFG_NUMERIC_LIMITS_BUG_COMPILED:INTERNAL=TRUE CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG_COMPILED:INTERNAL=TRUE CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG_COMPILED:INTERNAL=TRUE CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE +//Variable hidden from user +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so +//Variable hidden from user +CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so +CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 CGAL_Core_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_Core_3RD_PARTY_INCLUDE_DIRS:INTERNAL= CGAL_Core_3RD_PARTY_LIBRARIES:INTERNAL= @@ -1358,8 +1428,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_PDB_3RD_PARTY_DEFINITIONS:INTERNAL= @@ -1399,13 +1469,13 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1460,6 +1530,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1478,7 +1550,7 @@ CMAKE_HAVE_REMOVE:INTERNAL=1 CMAKE_HAVE_SHMAT:INTERNAL=1 //Start directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I +CMAKE_HOME_DIRECTORY:INTERNAL=/home/lrineau/CGAL/CGAL-I //Install .so files without execute permission. CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //Have library ICE @@ -1532,6 +1604,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL= -frounding-math -std=c++98 -ansi -Wall -pedantic -Wno-long-long -pedantic-errors -fdiagnostics-show-option //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1539,9 +1612,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2056,31 +2129,39 @@ Q_WS_WIN:INTERNAL= //Have symbol Q_WS_X11 Q_WS_X11:INTERNAL=1 //hide this -Qt_help_window_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_help_window.h +Qt_help_window_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_help_window.h //hide this -Qt_widget_OpenGL_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_widget_OpenGL.h +Qt_widget_OpenGL_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_OpenGL.h //hide this -Qt_widget_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_widget.h +Qt_widget_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget.h //hide this -Qt_widget_history_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_widget_history.h +Qt_widget_history_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_history.h //hide this -Qt_widget_layer_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_widget_layer.h +Qt_widget_layer_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_layer.h //hide this -Qt_widget_standard_toolbar_h:INTERNAL=/home/lrineau/CGAL/CGAL-3.8.1-I/include/CGAL/IO/Qt_widget_standard_toolbar.h +Qt_widget_standard_toolbar_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_standard_toolbar.h //ADVANCED property for variable: X11_ICE_INCLUDE_PATH X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_ICE_LIB X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2133,6 +2214,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt index 241a9f51c29..958e2ccc8da 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/usr/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/usr/lib/libboost_thread-mt.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING=-m32 -frounding-math //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; @@ -103,25 +115,25 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -962,6 +974,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=X11_ICE_LIB-NOTFOUND +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=X11_SM_LIB-NOTFOUND @@ -971,9 +986,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=X11_X11_LIB-NOTFOUND +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1052,6 +1076,12 @@ X11_Xinput_LIB:FILEPATH=X11_Xinput_LIB-NOTFOUND //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1144,7 +1174,9 @@ Boost_VERSION:INTERNAL=104100 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/usr/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib/libgmpxx.so;/usr/lib/libmpfr.so;/usr/lib/libgmp.so;/usr/lib/libboost_thread-mt.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib;/usr/lib;/usr/lib;/usr/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib;/usr/lib;/usr/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1267,7 +1299,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1289,8 +1321,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT @@ -1322,13 +1354,13 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=5 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1951,14 +1983,22 @@ X11_LIB_DNET_HAS_DNET_NTOA:INTERNAL= X11_LIB_DNET_STUB_HAS_DNET_NTOA:INTERNAL= //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL= +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2011,6 +2051,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt index 6af71c2bec2..ef7df40883b 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING= -frounding-math //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; @@ -103,25 +115,25 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpf CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-3.5-I-140/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -203,6 +215,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1037,6 +1052,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1046,9 +1064,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1127,6 +1154,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1219,7 +1252,9 @@ Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib;/home/lrineau/CGAL/boost/1.44-beta1/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1253,6 +1288,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE @@ -1277,6 +1315,9 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE @@ -1335,7 +1376,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1357,8 +1398,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT @@ -1392,13 +1433,13 @@ CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //MODIFIED property for variable: CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE-MODIFIED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1453,6 +1494,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1522,6 +1565,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL= -frounding-math //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1529,9 +1573,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2057,14 +2101,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2117,6 +2169,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt index cae934b7b15..e9aa361b076 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.42/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING=-I/home/lrineau/CGAL/boost/1.42/include -frounding-math //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; @@ -115,25 +127,25 @@ CGAL_PDB_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platform CGAL_PDB_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALPDB //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -215,6 +227,9 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local @@ -1052,6 +1067,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1061,9 +1079,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1142,6 +1169,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1234,7 +1267,9 @@ Boost_VERSION:INTERNAL=104200 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.42/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.42/lib;/home/lrineau/CGAL/boost/1.42/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.42/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=FALSE @@ -1271,6 +1306,9 @@ CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE +CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE @@ -1295,6 +1333,9 @@ CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1 +//Result of TRY_COMPILE +CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1 //Result of TRY_COMPILE CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE @@ -1353,7 +1394,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1375,8 +1416,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_PDB_3RD_PARTY_DEFINITIONS:INTERNAL= @@ -1416,13 +1457,13 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=4 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1475,6 +1516,8 @@ CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of generator. CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Have function connect @@ -1547,6 +1590,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +CONFIG_CXX_FLAGS:INTERNAL= -frounding-math -I/home/lrineau/CGAL/boost/1.42/include //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL @@ -1556,9 +1600,9 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL:INTERNAL=[/usr/lib64/libssl.so;/usr/lib64/l //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB -FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/include][/usr/lib64/libz.so][v1.2.5()] +FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE GCC_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -2086,14 +2130,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2146,6 +2198,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt index 7c74ce1bc6e..4ca016ba425 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -14,6 +14,12 @@ # EXTERNAL cache entries ######################## +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.48/include @@ -30,7 +36,10 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF //Directory containing the Maintenance package CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -39,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING= -frounding-math -std=c++11 //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -85,17 +94,20 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO +//The CGAL library +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so + //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so; @@ -103,25 +115,25 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpf CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1046,6 +1058,9 @@ X11_ICE_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + //Path to a library. X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so @@ -1055,9 +1070,18 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + //Path to a file. X11_XTest_INCLUDE_PATH:PATH=/usr/include @@ -1136,6 +1160,12 @@ X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so //Path to a file. X11_Xkb_INCLUDE_PATH:PATH=/usr/include +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND + //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1228,7 +1258,9 @@ Boost_VERSION:INTERNAL=104800 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.48/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.48/lib;/home/lrineau/CGAL/boost/1.48/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.48/lib +//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS +CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=TRUE @@ -1350,7 +1382,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1372,8 +1404,8 @@ CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so CGAL_ImageIO_USE_ZLIB:INTERNAL=ON -//Variable hidden from user -CGAL_LIBRARY:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 //Variable hidden from user CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT @@ -1405,13 +1437,13 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=5 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -1548,7 +1580,7 @@ FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()] //Details about finding Threads FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] //Details about finding X11 -FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] +FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include] //Details about finding ZLIB FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE @@ -2080,14 +2112,22 @@ X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_ICE_LIB-ADVANCED:INTERNAL=1 //Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_SM_LIB X11_SM_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_INCLUDE_PATH X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_INCLUDE_PATH X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XTest_LIB @@ -2140,6 +2180,10 @@ X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 X11_Xinput_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkb_INCLUDE_PATH X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_Xlib_INCLUDE_PATH diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt index d5895df0f3e..d6c7ac37ff1 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt @@ -17,6 +17,9 @@ //Build shared libraries BUILD_SHARED_LIBS:BOOL=ON +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + //Path to a file. Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch @@ -1073,6 +1076,12 @@ X11_X11_INCLUDE_PATH:PATH=/usr/include //Path to a library. X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND + //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1255,7 +1264,7 @@ Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1 @@ -1448,7 +1457,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache CMAKE_CACHE_MINOR_VERSION:INTERNAL=8 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=6 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE @@ -2121,6 +2130,10 @@ X11_SM_LIB-ADVANCED:INTERNAL=1 X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_X11_LIB X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XShm_INCLUDE_PATH X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 //ADVANCED property for variable: X11_XSync_INCLUDE_PATH From 2fe6b87265e04db2a6d18e025dbae85a7f2f1584 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 15:24:02 +0000 Subject: [PATCH 058/102] Use new recompilation of Boost libraries (with the -mt variant) --- .../CMakeCache.txt | 48 +++++++++---------- .../CMakeCache.txt | 22 ++++----- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt index 6faa9e8df6f..0bdba134135 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +# For build in directory: /home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -27,16 +27,16 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +CGAL_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi //Link with static Boost libraries CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF @@ -48,13 +48,13 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -w1 -O3 //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -94,46 +94,46 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO //The CGAL library -CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so +CGAL_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1186,7 +1186,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 @@ -1311,7 +1311,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1366,7 +1366,7 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt index ef1c5cb9aa9..beb8c651235 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1186,7 +1186,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 From 61f3360fca84683e693319fe4759031d76358353 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 15:24:15 +0000 Subject: [PATCH 059/102] Use new recompilation of Boost libraries (with the -mt variant) --- .../CMakeCache.txt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt index 456a71335af..0d644ae102a 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1171,7 +1171,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-cxxdebug/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 From 8363c0e8d667680327484d130124cac39fe73b0e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 15:49:58 +0000 Subject: [PATCH 060/102] Use new recompilation of Boost libraries (with the -mt variant) --- .../CMakeCache.txt | 16 ++++++------- .../CMakeCache.txt | 22 ++++++++--------- .../CMakeCache.txt | 16 ++++++------- .../CMakeCache.txt | 22 ++++++++--------- .../CMakeCache.txt | 16 ++++++------- .../CMakeCache.txt | 24 +++++++++---------- .../CMakeCache.txt | 22 ++++++++--------- .../CMakeCache.txt | 22 ++++++++--------- 8 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt index c68e9550703..e1524e4c078 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Path to a library. Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND //Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1251,7 +1251,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt index c1f2f4085f9..6aff88e6843 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.45/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -133,7 +133,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -145,7 +145,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1272,7 +1272,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104500 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.45/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.45/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.45/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt index ff13cd80c07..454f866b5f4 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Path to a library. Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND //Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1251,7 +1251,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt index 958e2ccc8da..9bc691a75fa 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt @@ -29,10 +29,10 @@ Boost_LIBRARY_DIRS:FILEPATH=/usr/lib //The Boost THREAD library Boost_THREAD_LIBRARY:FILEPATH=/usr/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/usr/lib/libboost_thread-mt.so -//Path to a library. +//Boost thread library (release) Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/usr/lib/libboost_thread-mt.so //Value Computed by CMake @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1160,7 +1160,7 @@ Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_LIBRARY_DIRS Boost_LIBRARY_DIRS-ADVANCED:INTERNAL=1 //The library version string for boost libraries -Boost_LIB_VERSION:INTERNAL=1_41 +Boost_LIB_VERSION:INTERNAL=1_47 //Whether the Boost THREAD library found Boost_THREAD_FOUND:INTERNAL=ON //ADVANCED property for variable: Boost_THREAD_LIBRARY @@ -1170,7 +1170,7 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 //The version number for boost libraries -Boost_VERSION:INTERNAL=104100 +Boost_VERSION:INTERNAL=104700 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/usr/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib/libgmpxx.so;/usr/lib/libmpfr.so;/usr/lib/libgmp.so;/usr/lib/libboost_thread-mt.so @@ -1402,7 +1402,7 @@ CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE //Result of TRY_COMPILE CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE //Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake +CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui //Executable file format CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS @@ -1482,7 +1482,7 @@ CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 CMAKE_STRIP-ADVANCED:INTERNAL=1 //Suppress Warnings that are meant for the author of the CMakeLists.txt // files. -CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=TRUE +CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE //uname command CMAKE_UNAME:INTERNAL=/bin/uname //ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt index ef7df40883b..69b191ae837 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.44-beta1/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Path to a library. Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND //Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1251,7 +1251,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104400 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.44-beta1/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.44-beta1/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt index e9aa361b076..d0f3c3838a8 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.42/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_PDB_BINARY_DIR:STATIC=/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_ CGAL_PDB_LIBRARY:STRING=/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_PDB.so //Dependencies for the target -CGAL_PDB_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; +CGAL_PDB_LIB_DEPENDS:STATIC=general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so; //Value Computed by CMake CGAL_PDB_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALPDB @@ -133,7 +133,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -145,7 +145,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1266,7 +1266,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104200 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.42/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.42/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt index 4ca016ba425..d0183a3bacf 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/1.48/include Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1257,7 +1257,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104800 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/1.48/include -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/1.48/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt index d6c7ac37ff1..81166795965 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt @@ -27,13 +27,13 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib //The Boost THREAD library -Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so +Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so +//Boost thread library (release) +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16 @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -109,7 +109,7 @@ CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so //Dependencies for the target -CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so; +CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so; //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I @@ -133,7 +133,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -145,7 +145,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1263,7 +1263,7 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 Boost_VERSION:INTERNAL=104900 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch -CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread.so +CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib/libboost_thread-mt.so CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage/lib //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 From 14cca2bcd3b4aabd02431dffd6537d41fd1fadd1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 15:58:58 +0000 Subject: [PATCH 061/102] All platforms are now updated with the new Boost compilations. --- .../CMakeCache.txt | 26 +++++++++---------- .../CMakeCache.txt | 8 +++--- .../CMakeCache.txt | 8 +++--- .../CMakeCache.txt | 24 +++++------------ .../CMakeCache.txt | 8 +++--- .../CMakeCache.txt | 8 +++--- .../CMakeCache.txt | 8 +++--- .../CMakeCache.txt | 8 +++--- 8 files changed, 44 insertions(+), 54 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt index 0bdba134135..5fd5eab8fcb 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -36,7 +36,7 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branc Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so //Value Computed by CMake -CGAL_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi //Link with static Boost libraries CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF @@ -48,10 +48,10 @@ CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -w1 -O3 //Value Computed by CMake -CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Core +CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Core //The CGAL_Core library -CGAL_Core_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Core.so +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Core.so //Dependencies for the target CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; @@ -94,10 +94,10 @@ CGAL_INSTALL_LIB_DIR:STRING=lib CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 //Value Computed by CMake -CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/ImageIO +CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/ImageIO //The CGAL_ImageIO library -CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_ImageIO.so +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_ImageIO.so //Dependencies for the target CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; @@ -106,7 +106,7 @@ CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastru CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO //The CGAL library -CGAL_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so +CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so //Dependencies for the target CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so; @@ -115,10 +115,10 @@ CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpf CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //Value Computed by CMake -CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt3 +CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt3 //The CGAL_Qt3 library -CGAL_Qt3_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt3.so +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt3.so //Dependencies for the target CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; @@ -127,10 +127,10 @@ CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructur CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 //Value Computed by CMake -CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt4 +CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt4 //The CGAL_Qt4 library -CGAL_Qt4_LIBRARY:STRING=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt4.so +CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt4.so //Dependencies for the target CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; @@ -1311,7 +1311,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE //Variable hidden from user -CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so +CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1366,7 +1366,7 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt index e1524e4c078..b9212e3748f 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt index 454f866b5f4..91237708694 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt index aa1cdaa0b15..3b56ae96d09 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/CMakeCache.txt @@ -29,12 +29,6 @@ Boost_LIBRARY_DIRS:FILEPATH=/usr/lib64 //The Boost THREAD library Boost_THREAD_LIBRARY:FILEPATH=/usr/lib64/libboost_thread-mt.so -//Path to a library. -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=Boost_THREAD_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libboost_thread-mt.so - //Value Computed by CMake CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi @@ -54,7 +48,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +94,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -133,7 +127,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -145,7 +139,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/usr/lib64/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 @@ -1265,17 +1259,13 @@ Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_LIBRARY_DIRS Boost_LIBRARY_DIRS-ADVANCED:INTERNAL=1 //The library version string for boost libraries -Boost_LIB_VERSION:INTERNAL=1_37 +Boost_LIB_VERSION:INTERNAL=1_47 //Whether the Boost THREAD library found Boost_THREAD_FOUND:INTERNAL=ON //ADVANCED property for variable: Boost_THREAD_LIBRARY Boost_THREAD_LIBRARY-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: Boost_THREAD_LIBRARY_DEBUG -Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 -//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE -Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 //The version number for boost libraries -Boost_VERSION:INTERNAL=103700 +Boost_VERSION:INTERNAL=104700 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/usr/include CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/usr/lib64/libboost_thread-mt.so @@ -1597,7 +1587,7 @@ CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 CMAKE_STRIP-ADVANCED:INTERNAL=1 //Suppress Warnings that are meant for the author of the CMakeLists.txt // files. -CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=TRUE +CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE //uname command CMAKE_UNAME:INTERNAL=/bin/uname //ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt index 9bc691a75fa..3dc9295413d 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so;general;/usr/lib/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/usr/lib/qt-3.3/lib/libqassistantclient.a;general;/usr/lib/qt-3.3/lib/libqt-mt.so;general;dl;general;-lpthread;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-m32/lib/libCGAL.so;general;/usr/lib/libgmpxx.so;general;/usr/lib/libmpfr.so;general;/usr/lib/libgmp.so;general;/usr/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib/libGLU.so;general;/usr/lib/libGL.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt index 69b191ae837..49d4f161c06 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.44-beta1/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt index d0f3c3838a8..5cddaea0f2c 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -133,7 +133,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -145,7 +145,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_Release-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.42/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt index d0183a3bacf..05dfe7ecd33 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/CMakeCache.txt @@ -54,7 +54,7 @@ CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86 CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Core.so //Dependencies for the target -CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so; +CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so; //Value Computed by CMake CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore @@ -100,7 +100,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/ CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_ImageIO.so //Dependencies for the target -CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; +CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so; //Value Computed by CMake CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO @@ -121,7 +121,7 @@ CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt3.so //Dependencies for the target -CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3 @@ -133,7 +133,7 @@ CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86- CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL_Qt4.so //Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; +CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_g++-trunk_CXX0X-F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/1.48/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so; //Value Computed by CMake CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4 From c8cacc83c03fbd2f61f61d089a8ecded1baa4e57 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 11 Apr 2012 17:03:36 +0000 Subject: [PATCH 062/102] Changes for CGAL-4.0.1 that were not yet written --- Installation/changes.html | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Installation/changes.html b/Installation/changes.html index bd4d957c22b..02f0bc7250d 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -108,6 +108,7 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/
    • Minor bugfix.
    +

    Release 4.0.1

    @@ -118,11 +119,32 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/ This is a bug fix release. The following has been changed since CGAL-4.0:

    -

    2D and 3D Geometry Kernel

    +

    2D Voronoi Diagram Adaptor (re-added)

      -
    • Fix a bug in the Segment_3-Triangle_3 intersection function in the case the segment is collinear with a triangle edge..
      • +
    • The package 2D Voronoi Diagram Adaptor was temporarily + removed from the CGAL distribution because of license issues. That + package is now back into CGAL. +
    +

    2D and 3D Geometry Kernel

    +
      +
    • Fix a bug in the Segment_3-Triangle_3 intersection function in the case the segment is collinear with a triangle edge..
      • +
    + +

    Algebraic Kernel

    +
      +
    • Avoids linking error "duplicate symbols" when two compilation units + using the algebraic kernel are linked.
      • +
    + +

    Surface Mesh Generation and 3D Mesh Generation

    +
      +
    • Fix an important bug in the CGAL_ImageIO library, that + could lead to wrong result when meshing from a 3D image.
      • +
    + +

    Release 4.0

    From 40f3e21e3ee17822ef49f223d9ff0074579cf827 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 12 Apr 2012 11:45:31 +0000 Subject: [PATCH 063/102] Recompile Boost libraries with g++-4.5 On that machine, I use g++-4.5, 4.6, and 4.7. If I compile the Boost libraries with the oldest compiler, the binary compatibility is ensured, because the soname of libstd++ is libstdc++.so.6 for all of those compilers (but the binary compatibility is only ensured backward: if a Boost library is compiled with g++-4.6, that does not work if it is after linked with libstdc++ of g++-4.5). --- .../renoir.geometryfactory.com/boost/compile-boost | 2 +- .../renoir.geometryfactory.com/boost/user-config.jam | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost index 40e95879553..77ecb1ae06f 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost @@ -8,7 +8,7 @@ if [ ! -x $BJAM ]; then BJAM=bjam fi -"$BJAM" $OPTS toolset=gcc-4.6.3 +"$BJAM" $OPTS toolset=gcc-4.5.4 "$BJAM" --stagedir=stage-cxxdebug $OPTS toolset=gcc-cxxdebug source ~/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam index 3462424b5f1..68e71072dae 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam @@ -44,6 +44,8 @@ # Configure specific gcc version, giving alternative name to use. # using gcc : 3.2 : g++-3.2 ; +# G++ 4.5 +using gcc : : /usr/local/packages/gcc-4.5/bin/g++ ; # ------------------- # MSVC configuration. From f22ae81a919db06319deffc88cb9c8fa59fa6d2e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 12 Apr 2012 14:35:20 +0000 Subject: [PATCH 064/102] Trivial bug: add missing #include If CGAL::cpp0x::tuple is Boosts implementation, one wants equality operator operator==. Add the corresponding test in test/STL_Extension/. --- STL_Extension/include/CGAL/tuple.h | 1 + STL_Extension/test/STL_Extension/test_stl_extension.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index 7caa2c05098..65699b3c76e 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -31,6 +31,7 @@ # include #else # include +# include #endif namespace CGAL { diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index d81c78068db..a7ab589d457 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -8109,10 +8109,14 @@ void test_tuple(){ CGAL_static_assertion( (boost::is_same::type,My_to_int>::value) ); T1 t1=CGAL::cpp0x::make_tuple(1,2); + T1 t1_2=CGAL::cpp0x::make_tuple(1,2); int i1=-1,i2=-1; CGAL::cpp0x::tie(i1,i2)=t1; CGAL_assertion( CGAL::cpp0x::get<0>(t1)==i1 ); CGAL_assertion( CGAL::cpp0x::get<1>(t1)==i2 ); + CGAL_assertion(t1==t1_2); // test the equality operator + T2 t2 = T2(); + CGAL_assertion( t2 == T2() ); } void test_prev_next() From 5d3bd1094c78cb8ea797b0291051c3e7483ceca2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 13 Apr 2012 07:55:43 +0000 Subject: [PATCH 065/102] In the testsuite, once the reference cache is loaded, unset some nasty variables, such as eg. CGAL_Qt4_BINARY_DIR. --- Installation/CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 3f2582a4c23..a35f785747b 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -339,7 +339,26 @@ if ( RUNNING_CGAL_AUTO_TEST ) CGAL_PDB_BINARY_DIR CGAL_PDB_SOURCE_DIR CGAL_Qt3_SOURCE_DIR + CGAL_BINARY_DIR CGAL_SOURCE_DIR) +# message("List of cache variables:") + + ## The following lines removes nasty loaded cache values. We do not + ## want that the current build tree depends on binaries that were + ## build in the reference build tree. + get_property(cache_variables DIRECTORY PROPERTY CACHE_VARIABLES) + foreach(var ${cache_variables}) +# get_property(var_value CACHE ${var} PROPERTY VALUE) +# get_property(type CACHE ${var} PROPERTY TYPE) + string(REGEX MATCH "^CGAL(_.*_(DEPENDS|BINARY_DIR)|_.*LIBRARY)$" var_name_matches ${var}) + if(var_name_matches) + unset(${var} CACHE) +# else() +# message("${var}:${var_type}=${var_value}") + endif() + endforeach() + + endif() endif() endif() From 678f252224c9a903b6cb243e7407ec8142ecccb9 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 13 Apr 2012 10:20:43 +0000 Subject: [PATCH 066/102] Add missing test for --- .../test/STL_Extension/test_is_iterator.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 STL_Extension/test/STL_Extension/test_is_iterator.cpp diff --git a/STL_Extension/test/STL_Extension/test_is_iterator.cpp b/STL_Extension/test/STL_Extension/test_is_iterator.cpp new file mode 100644 index 00000000000..31aaf66957f --- /dev/null +++ b/STL_Extension/test/STL_Extension/test_is_iterator.cpp @@ -0,0 +1,15 @@ +#include +#include +#include +#include + +int main() { + typedef std::vector::const_iterator vector_it; + typedef int* int_p; + using CGAL::is_iterator; + + CGAL_static_assertion(is_iterator::value); + CGAL_static_assertion(!is_iterator::value); + CGAL_static_assertion(!is_iterator::value); + CGAL_static_assertion(is_iterator::value); +} From eef911bc023d35159aad2f28663f4164d8cbe809 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 13 Apr 2012 10:40:12 +0000 Subject: [PATCH 067/102] New MPL type checking: is_streamable is_streamable is a meta-function that checks if a type is streamable is_streamable::value is true iff the type T has stream operators << and >>. Otherwise it is false. That commit adds a new header, used nowhere, and a new test. That cannot break anything. I do it directly to 'next', with my own approval. --- .gitignore | 19 +++++ STL_Extension/include/CGAL/is_streamable.h | 84 +++++++++++++++++++ .../test/STL_Extension/test_is_streamable.cpp | 25 ++++++ 3 files changed, 128 insertions(+) create mode 100644 STL_Extension/include/CGAL/is_streamable.h create mode 100644 STL_Extension/test/STL_Extension/test_is_streamable.cpp diff --git a/.gitignore b/.gitignore index d7ca6c48ec4..86dbe03bb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -988,7 +988,26 @@ Ridges_3/test/Ridges_3/Makefile Ridges_3/test/Ridges_3/ridge_test STL_Extension/test/STL_Extension/CMakeLists.txt STL_Extension/test/STL_Extension/cgal_test_with_cmake +STL_Extension/test/STL_Extension/test_Cache +STL_Extension/test/STL_Extension/test_Compact_container +STL_Extension/test/STL_Extension/test_Concatenate_iterator +STL_Extension/test/STL_Extension/test_Flattening_iterator +STL_Extension/test/STL_Extension/test_Handle_with_policy +STL_Extension/test/STL_Extension/test_In_place_list +STL_Extension/test/STL_Extension/test_Modifiable_priority_queue +STL_Extension/test/STL_Extension/test_Nested_iterator +STL_Extension/test/STL_Extension/test_Uncertain +STL_Extension/test/STL_Extension/test_complexity_tags +STL_Extension/test/STL_Extension/test_composition +STL_Extension/test/STL_Extension/test_dispatch_output +STL_Extension/test/STL_Extension/test_is_iterator +STL_Extension/test/STL_Extension/test_is_streamable +STL_Extension/test/STL_Extension/test_lexcompare_outputrange +STL_Extension/test/STL_Extension/test_multiset STL_Extension/test/STL_Extension/test_nth_element +STL_Extension/test/STL_Extension/test_stl_extension +STL_Extension/test/STL_Extension/test_type_traits +STL_Extension/test/STL_Extension/test_vector Skin_surface_3/.cdtproject Skin_surface_3/.project Skin_surface_3/.settings diff --git a/STL_Extension/include/CGAL/is_streamable.h b/STL_Extension/include/CGAL/is_streamable.h new file mode 100644 index 00000000000..0decd728953 --- /dev/null +++ b/STL_Extension/include/CGAL/is_streamable.h @@ -0,0 +1,84 @@ +// Copyright (c) 2012 GeometryFactory Sarl (France) +// All rights reserved. +// +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// 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, Philipp Moeller + +#ifndef CGAL_IS_STREAMABLE_H +#define CGAL_IS_STREAMABLE_H + +#include +#include +#include +#include + +namespace CGAL { +namespace internal { +namespace is_streamable +{ + // A tag type returned by operator == for the any struct in this namespace + // when T does not support ==. + struct tag {}; + + // This type soaks up any implicit conversions and makes the following operator == + // less preferred than any other such operator found via ADL. + struct any + { + // Conversion constructor for any type. + template + any(T const&); + }; + + tag operator<<(any const&, any const&); + tag operator>>(any const&, any const&); + + // Two overloads to distinguish whether T supports a certain operator expression. + // The first overload returns a reference to a two-element character array and is chosen if + // T does not support the expression, such as ==, whereas the second overload returns a char + // directly and is chosen if T supports the expression. So using sizeof(check()) + // returns 2 for the first overload and 1 for the second overload. + typedef char yes; + typedef char (&no)[2]; + + no check(tag); + + template + yes check(T const&); + + template + struct is_streamable_impl + { + static typename boost::remove_cv::type>::type const & x; + static typename boost::remove_cv::type>::type & y; + + static const bool value = + sizeof(is_streamable::check(std::cout << x)) == sizeof(is_streamable::yes) && + sizeof(is_streamable::check(std::cin >> y)) == sizeof(is_streamable::yes); + }; + +} // end namespace internal::is_streamable +} // end namespace internal + + +/// is_streamable is a meta-function that checks if a type is streamable +/// +/// is_streamable::value is true iff the type T has stream operators << +/// and >>. Otherwise it is false. +template +struct is_streamable + : internal::is_streamable::is_streamable_impl {}; + +} // end namespace CGAL + +#endif // CGAL_IS_STREAMABLE_H diff --git a/STL_Extension/test/STL_Extension/test_is_streamable.cpp b/STL_Extension/test/STL_Extension/test_is_streamable.cpp new file mode 100644 index 00000000000..8e18e004489 --- /dev/null +++ b/STL_Extension/test/STL_Extension/test_is_streamable.cpp @@ -0,0 +1,25 @@ +#include +#include +#include +#include // std::pair + +struct A {}; +struct B {}; + +using std::ostream; +using std::istream; + +ostream& operator<<(ostream& os, const B&) { return os; } +istream& operator>>(istream& is, const B&) { return is; } + +int main() { + typedef std::vector::const_iterator vector_it; + typedef int* int_p; + using CGAL::is_streamable; + + CGAL_static_assertion(!is_streamable::value); + CGAL_static_assertion(is_streamable::value); + CGAL_static_assertion(is_streamable::value); + CGAL_static_assertion(is_streamable::value); + CGAL_static_assertion(! (is_streamable >::value) ); +} From dcfe23867b11b050e0b62f04ea82a78d292e8a49 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 13 Apr 2012 13:01:32 +0000 Subject: [PATCH 068/102] Add some \ccHtmlNoLinksFrom --- .../doc_tex/Triangulation_2/triangulation_user.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex b/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex index 18368831f49..e9fbf24047d 100644 --- a/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex +++ b/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex @@ -788,11 +788,11 @@ The class \ccc{Regular_triangulation_2} is designed to maintain the regular triangulation of a set of $2d$ weighted points. It derives from the class \ccc{Triangulation_2}. -The functions \ccc{insert} and +The functions \ccHtmlNoLinksFrom{\ccc{insert}} and \ccc{remove} are overwritten to handle weighted points and maintain the regular property. -In current version, function \ccc{move} is not +The function \ccHtmlNoLinksFrom{\ccc{move}} is not overwritten and thus does not preserve the regular property. The vertices of the regular triangulation of a set of weighted points ${PW}$ correspond only to a subset @@ -968,7 +968,7 @@ overrides the insertion and removal of a point to take care of the information about constrained edges. The class also allows inline insertion of a new constraint, given by its two endpoints or the removal of a constraint. -In current version, function \ccc{move} is not +In current version, function \ccHtmlNoLinksFrom{\ccc{move}} is not overwritten and thus does not take care of the constraints. \subsubsection{The Geometric Traits} @@ -1221,7 +1221,7 @@ classes. The class \ccc{Triangulation_hierarchy_2} inherits from the triangulation type passed as template parameter \ccc{Tr}. -The \ccc{insert}, \ccc{move}, and \ccc{remove} member functions +The \ccHtmlNoLinksFrom{\ccc{insert}}, \ccHtmlNoLinksFrom{\ccc{move}}, and \ccc{remove} member functions are overwritten to update the data structure at each operation. The locate queries are also overwritten to take advantage of the data structure for a fast processing. @@ -1382,7 +1382,7 @@ of the corresponding point given in the range. \subsubsection{Using an Iterator Over Pairs} Each point and its information are gathered into a pair. We provide -the \ccc{insert} function of the triangulation with a range of such pairs. +the \ccHtmlNoLinksFrom{\ccc{insert}} function of the triangulation with a range of such pairs. \ccIncludeExampleCode{Triangulation_2/info_insert_with_pair_iterator_2.cpp} From 9d041ed59ae9e34479168d6543a0686e39fe4494 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 16 Apr 2012 12:48:50 +0000 Subject: [PATCH 069/102] Better testing of CGAL::is_streamable --- STL_Extension/test/STL_Extension/test_is_streamable.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/STL_Extension/test/STL_Extension/test_is_streamable.cpp b/STL_Extension/test/STL_Extension/test_is_streamable.cpp index 8e18e004489..2a8ebfcbecc 100644 --- a/STL_Extension/test/STL_Extension/test_is_streamable.cpp +++ b/STL_Extension/test/STL_Extension/test_is_streamable.cpp @@ -5,6 +5,8 @@ struct A {}; struct B {}; +struct C {}; +struct D {}; using std::ostream; using std::istream; @@ -12,6 +14,9 @@ using std::istream; ostream& operator<<(ostream& os, const B&) { return os; } istream& operator>>(istream& is, const B&) { return is; } +ostream& operator<<(ostream& os, const C&) { return os; } +istream& operator>>(istream& is, const D&) { return is; } + int main() { typedef std::vector::const_iterator vector_it; typedef int* int_p; @@ -19,6 +24,8 @@ int main() { CGAL_static_assertion(!is_streamable::value); CGAL_static_assertion(is_streamable::value); + CGAL_static_assertion(!is_streamable::value); + CGAL_static_assertion(!is_streamable::value); CGAL_static_assertion(is_streamable::value); CGAL_static_assertion(is_streamable::value); CGAL_static_assertion(! (is_streamable >::value) ); From b3822e9b85d809386d3fbe6e8dca045ad34a96be Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 16 Apr 2012 13:49:19 +0000 Subject: [PATCH 070/102] Extend the test, again That time, one checks that boost::tuple has I/O operators. --- STL_Extension/test/STL_Extension/test_is_streamable.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/STL_Extension/test/STL_Extension/test_is_streamable.cpp b/STL_Extension/test/STL_Extension/test_is_streamable.cpp index 2a8ebfcbecc..c969eb94cbe 100644 --- a/STL_Extension/test/STL_Extension/test_is_streamable.cpp +++ b/STL_Extension/test/STL_Extension/test_is_streamable.cpp @@ -2,6 +2,8 @@ #include #include #include // std::pair +#include +#include struct A {}; struct B {}; @@ -29,4 +31,5 @@ int main() { CGAL_static_assertion(is_streamable::value); CGAL_static_assertion(is_streamable::value); CGAL_static_assertion(! (is_streamable >::value) ); + CGAL_static_assertion( (is_streamable >::value) ); } From 5e15466696d36df6cdf4eef4f9c08fb657c6f31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Mon, 16 Apr 2012 14:36:03 +0000 Subject: [PATCH 071/102] BUGFIX: Memory leak in Parameterization_mesh_feature_extractor Parameterization_mesh_feature_extractor wasn't cleaning up the BorderS it allocated. --- .../include/CGAL/Parameterization_mesh_feature_extractor.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h index 6942c73b5f5..b0c240174c0 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h @@ -98,7 +98,12 @@ public: m_nb_borders = -1; m_genus = -1; } - virtual ~Parameterization_mesh_feature_extractor() {} + + virtual ~Parameterization_mesh_feature_extractor() { + for (typename Skeleton::iterator iter = m_skeleton.begin(); + iter != m_skeleton.end(); ++iter) + delete *iter; + } /// Get number of borders. int get_nb_borders() From 5eb0734d02a91cf5e68ed7931146b881624492b9 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 16 Apr 2012 15:24:14 +0000 Subject: [PATCH 072/102] Remove a warning: var set but not used --- .../include/CGAL/Parameterization_polyhedron_adaptor_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h index caa07bfbbb6..20ece77181c 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h @@ -441,7 +441,7 @@ public: int index = 0; for (Vertex_iterator it=mesh_vertices_begin(); it!=mesh_vertices_end(); it++) { - Point_3 position = get_vertex_position(it); + // Point_3 position = get_vertex_position(it); /*#ifdef DEBUG_TRACE fprintf(stderr, " %d=(%f,%f,%f)\n", index, From 0c5b3fcf8586cf6ebb9edf4f3dcb33010d3e3cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Mon, 16 Apr 2012 16:21:21 +0000 Subject: [PATCH 073/102] WARNINGFIX: Nef_2 is no longer triggering a "suggest parenthesis" --- Nef_2/include/CGAL/Nef_2/PM_checker.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nef_2/include/CGAL/Nef_2/PM_checker.h b/Nef_2/include/CGAL/Nef_2/PM_checker.h index a22caee7723..339baf0d0ad 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_checker.h +++ b/Nef_2/include/CGAL/Nef_2/PM_checker.h @@ -174,9 +174,9 @@ check_forward_prefix_condition(Vertex_const_handle v) const error_status << " el_forward = " << el_forward; error_status << " is_left_turn = " << is_left_turn; CGAL_assertion_msg( (ef == el || - ef_forward && !el_forward || - ef_forward && el_forward && is_left_turn || - !ef_forward && !el_forward && is_left_turn) , + (ef_forward && !el_forward) || + (ef_forward && el_forward && is_left_turn) || + (!ef_forward && !el_forward && is_left_turn)) , error_status.str().c_str()); } From 3889dc2d7f26dae06cae6462db51cc01affca53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 17 Apr 2012 12:03:00 +0000 Subject: [PATCH 074/102] BUGFIX Fixed the leak of an empty memory block. --- .../include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h index f34e7549469..76b9601f05d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h @@ -218,9 +218,12 @@ void Basic_sweep_line_2::_init_structures() { CGAL_assertion(m_queue->empty()); CGAL_assertion((m_statusLine.size() == 0)); - - // Allocate all of the Subcurve objects as one block. - m_subCurves = m_subCurveAlloc.allocate(m_num_of_subCurves); + + // Allocate all of the Subcurve objects as one block. Don't allocate + // anything when there are no subcurves. + if (m_num_of_subCurves > 0) { + m_subCurves = m_subCurveAlloc.allocate(m_num_of_subCurves); + } return; } From cdf47795ba551093b1d3d03525dffe21d9eb682c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 17 Apr 2012 12:17:23 +0000 Subject: [PATCH 075/102] Fixed a small memory leak in one of the testcases. --- .../test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h index fdc73205eb5..7fc3279c2cb 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h @@ -135,6 +135,8 @@ _test_cls_hierarchy_2() h.remove_constraint(v[3],v[4]); // h.print(); + for(int i=0; i <10; i++) { delete v[i];} + return; } From 03ac39132a6c46207000064ae18c7f312a9096ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 17 Apr 2012 17:37:53 +0000 Subject: [PATCH 077/102] remove unused var warning --- Nef_3/include/CGAL/Nef_3/ID_support_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h index 46116622d73..975f2fb3889 100644 --- a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h +++ b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h @@ -45,7 +45,7 @@ class ID_support_handler { ID_support_handler() {} int get_hash(int) { return 0; } - template void initialize_hash(Handle h) {} + template void initialize_hash(Handle /*h*/) {} void initialize_hash(int i) {} void handle_support(SVertex_handle , SHalfedge_const_handle , From 24070082f6979de962353a136626e4326365bcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 17 Apr 2012 18:18:09 +0000 Subject: [PATCH 078/102] *deprecate the use of geninfo *naive replacement of void* and geninfo by boost::any. *old code can be used if CGAL_I_DO_WANT_TO_USE_GENINFO is defined *info was printed, I simply ignored that for boost::any (it probably made sense why the old implementation of geninfo that was using placement new to write inside the void*) *some sizeof(void*) was used in SNC_structure.h for printing the size of something. I guessed this was related to the void* used as info. I left that code untouched. *testsuite is OK on my machine except Nef_3/example/Nef_3/polygon_construction which also does not work with next on my machine --- Nef_2/include/CGAL/Nef_2/HDS_items.h | 45 +++++- Nef_2/include/CGAL/Nef_2/PM_const_decorator.h | 15 +- Nef_2/include/CGAL/Nef_2/PM_decorator.h | 4 + Nef_2/include/CGAL/Nef_2/PM_overlayer.h | 110 +++++++++++++-- Nef_2/include/CGAL/Nef_2/PM_point_locator.h | 65 ++++++++- Nef_2/include/CGAL/Nef_2/gen_point_location.h | 48 ++++++- Nef_2/include/CGAL/Nef_2/geninfo.h | 5 + Nef_3/include/CGAL/Nef_3/Halfedge.h | 14 +- Nef_3/include/CGAL/Nef_3/SFace.h | 8 ++ Nef_3/include/CGAL/Nef_3/SHalfedge.h | 14 +- Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h | 29 +++- Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h | 4 + .../include/CGAL/Nef_3/SNC_const_decorator.h | 8 ++ Nef_3/include/CGAL/Nef_3/SNC_decorator.h | 8 ++ Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 8 ++ Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h | 8 ++ Nef_3/include/CGAL/Nef_3/SNC_structure.h | 6 +- Nef_3/include/CGAL/Nef_3/Vertex.h | 8 ++ .../include/CGAL/Nef_S2/SM_const_decorator.h | 8 ++ Nef_S2/include/CGAL/Nef_S2/SM_decorator.h | 7 + Nef_S2/include/CGAL/Nef_S2/SM_items.h | 45 +++++- Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h | 131 +++++++++++++++--- Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h | 4 + Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h | 69 +++++++-- 24 files changed, 600 insertions(+), 71 deletions(-) diff --git a/Nef_2/include/CGAL/Nef_2/HDS_items.h b/Nef_2/include/CGAL/Nef_2/HDS_items.h index 213e191b90c..ac11eea2930 100644 --- a/Nef_2/include/CGAL/Nef_2/HDS_items.h +++ b/Nef_2/include/CGAL/Nef_2/HDS_items.h @@ -26,6 +26,9 @@ #include #include #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif namespace CGAL { @@ -61,7 +64,11 @@ public: typedef typename Refs::Face_const_handle Face_const_handle; typedef typename Refs::Halfedge Halfedge; typedef typename Refs::Face Face; - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Traits::Point Point; // geometric embedding typedef typename Traits::Mark Mark; // information @@ -76,12 +83,20 @@ private: GenPtr _i; public: - Nef_vertex_2() : _h(),_f(),_ivit(),_m(0),_i((GenPtr)0xABCD) {} + Nef_vertex_2() : _h(),_f(),_ivit(),_m(0) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + ,_i((GenPtr)0xABCD) + #endif + {} // constructs an uninitialized vertex concerning embedding // and mark. All links are initialized by their default value. Nef_vertex_2( const Point& p) : - _h(),_f(),_p(p),_ivit(),_m(0),_i((GenPtr)0xABCD) {} + _h(),_f(),_p(p),_ivit(),_m(0) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + ,_i((GenPtr)0xABCD) + #endif + {} // constructs a vertex with embedding |p| and mark |m|. // All links are initialized by their default value. @@ -138,7 +153,11 @@ public: typedef typename Refs::Face_const_handle Face_const_handle; typedef typename Refs::Vertex Vertex; typedef typename Refs::Face Face; - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename std::list::iterator fc_iterator; @@ -154,7 +173,11 @@ protected: public: Nef_halfedge_2() : - opp(),prv(),nxt(),_v(),_f(),_fcit(),_m(0),_i((GenPtr)0xABCD) {} + opp(),prv(),nxt(),_v(),_f(),_fcit(),_m(0) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + ,_i((GenPtr)0xABCD) + #endif + {} /*{\Mcreate constructs an uninitialized halfedge concerning embedding and mark. All links are initialized by their default value.}*/ @@ -227,7 +250,11 @@ public: typedef typename Refs::Face_const_handle Face_const_handle; typedef typename Refs::Vertex Vertex; typedef typename Refs::Halfedge Halfedge; - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Traits::Mark Mark; // mark information @@ -300,7 +327,11 @@ private: GenPtr _i; public: - Nef_face_2() : _e(),_m(0),_i((GenPtr)0xABCD) {} + Nef_face_2() : _e(),_m(0) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + ,_i((GenPtr)0xABCD) + #endif + {} /*{\Mcreate constructs an uninitialized face with undefined mark, empty face cycle list, and empty isolated vertices list.}*/ diff --git a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h index e0f6245e4d8..946f3313e3e 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h @@ -32,6 +32,10 @@ #define CGAL_NEF_DEBUG 7 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template @@ -132,8 +136,13 @@ typedef typename Traits::Mark Mark; /*{\Mtypemember All objects (vertices, edges, faces) are attributed by a |Mark| object.}*/ typedef size_t Size_type; +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO /*{\Mtypemember The size type.}*/ typedef void* GenPtr; +#else +typedef boost::any GenPtr; +#endif + typedef typename HDS::Vertex Vertex; @@ -403,7 +412,11 @@ std::string PE(HH e) { std::ostringstream os; if (e==HH()) return "nil"; os << "[" << PV(e->opposite()->vertex()) << "," - << PV(e->vertex()) << " " << e->info() << "]"; + << PV(e->vertex()) << " " + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + << e->info() + #endif + << "]"; return os.str(); } diff --git a/Nef_2/include/CGAL/Nef_2/PM_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_decorator.h index d4b0df31fcb..61a791c47dd 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_decorator.h @@ -21,7 +21,11 @@ #ifndef CGAL_PM_DECORATOR_H #define CGAL_PM_DECORATOR_H #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #include #include diff --git a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h index 3e5827408d7..9703b10b272 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h +++ b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h @@ -25,7 +25,11 @@ #include #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #undef CGAL_NEF_DEBUG #define CGAL_NEF_DEBUG 13 #include @@ -49,7 +53,11 @@ struct PMO_from_segs { Vertex_handle new_vertex(const Point& p) { Vertex_handle v = G.new_vertex(p); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(G.info(v)); + #else + G.info(v)=Halfedge_handle(); + #endif return v; } @@ -78,15 +86,32 @@ struct PMO_from_segs { { D.ending_segment(v,it); } void halfedge_below(Vertex_handle v, Halfedge_handle e) const - { geninfo::access(G.info(v)) = e; } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::access(G.info(v)) = e; + #else + *boost::any_cast(&G.info(v)) = e; + #endif + } Halfedge_handle halfedge_below(Vertex_handle v) const - { return geninfo::access(G.info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(G.info(v)); + #else + return + boost::any_cast(G.info(v)); + #endif + } void clear_temporary_vertex_info() const { Vertex_handle v; for(v = G.vertices_begin(); v!= G.vertices_end(); ++v) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::clear(G.info(v)); + #else + G.info(v)=boost::any(); + #endif } @@ -634,13 +659,32 @@ struct vertex_info { }; void assoc_info(Vertex_handle v) const -{ geninfo::create(info(v)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(v)); + #else + info(v)=vertex_info(); + #endif +} void discard_info(Vertex_handle v) const -{ geninfo::clear(info(v)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(v)); + #else + info(v)=boost::any(); + #endif +} vertex_info& ginfo(Vertex_handle v) const -{ return geninfo::access(info(v)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(v)); + #else + return + *boost::any_cast(&info(v)); + #endif +} Mark& mark(Vertex_handle v, int i) const { return ginfo(v).m[i]; } @@ -667,15 +711,36 @@ struct halfedge_info { }; void assoc_info(Halfedge_handle e) const -{ geninfo::create(info(e)); - geninfo::create(info(twin(e))); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(e)); + geninfo::create(info(twin(e))); + #else + info(e)=halfedge_info(); + info(twin(e))=halfedge_info(); + #endif +} void discard_info(Halfedge_handle e) const -{ geninfo::clear(info(e)); - geninfo::clear(info(twin(e))); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(e)); + geninfo::clear(info(twin(e))); + #else + info(e)=boost::any(); + info(twin(e))=boost::any(); + #endif +} halfedge_info& ginfo(Halfedge_handle e) const -{ return geninfo::access(info(e)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(e)); + #else + return + *boost::any_cast(&info(e)); + #endif +} Mark& mark(Halfedge_handle e, int i) const // uedge information we store in the smaller one @@ -702,13 +767,32 @@ struct face_info { }; void assoc_info(Face_handle f) const -{ geninfo::create(info(f)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(f)); + #else + info(f)=face_info(); + #endif +} void discard_info(Face_handle f) const -{ geninfo::clear(info(f)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(f)); + #else + info(f)=boost::any(); + #endif +} face_info& ginfo(Face_handle f) const -{ return geninfo::access(info(f)); } +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(f)); + #else + return + *boost::any_cast(&info(f)); + #endif +} Mark& mark(Face_handle f, int i) const { return ginfo(f).m[i]; } diff --git a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h index 2898d35fc71..e5a85a57dc8 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h @@ -29,7 +29,11 @@ #undef CGAL_NEF_DEBUG #define CGAL_NEF_DEBUG 17 #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #ifdef CGAL_USE_LEDA #include @@ -468,27 +472,57 @@ public: void operator()(Vertex_handle vn, Vertex_const_handle vo) const { Face_const_handle f; if ( Po.is_isolated(vo) ) f = Po.face(vo); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(info(vn)); geninfo::access(info(vn)) = VF_pair(vo,f); + #else + info(vn) = VF_pair(vo,f); + #endif CGAL_NEF_TRACEN("linking to org "<::create(info(hn)); + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(hn)); geninfo::access(info(hn)) = EF_pair(ho,Po.face(ho)); + #else + info(hn) = EF_pair(ho,Po.face(ho)); + #endif CGAL_NEF_TRACEN("linking to org "<::const_access(CT.info(v)).first; } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::const_access(CT.info(v)).first; + #else + return + boost::any_cast(CT.info(v)).first; + #endif + } Halfedge_const_handle input_halfedge(Halfedge_const_handle e) const - { return geninfo::const_access(CT.info(e)).first; } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::const_access(CT.info(e)).first; + #else + return + boost::any_cast(CT.info(e)).first; + #endif + } Face_const_handle input_face(Halfedge_const_handle e) const - { return geninfo::const_access(CT.info(e)).second; } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::const_access(CT.info(e)).second; + #else + return + boost::any_cast(CT.info(e)).second; + #endif + } Object_handle input_object(Vertex_const_handle v) const @@ -547,10 +581,19 @@ protected: { Halfedge_handle e_from = previous(e); Face_const_handle f; if ( is_closed_at_source(e) ) // source(e) was isolated before + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO f = geninfo::access(info(source(e))).second; else - f = geninfo::access(info(e_from)).second; + f = geninfo::access(info(e_from)).second; + #else + f = + boost::any_cast(info(source(e))).second; + else + f = + boost::any_cast(info(e_from)).second; + #endif mark(e) = _DP.mark(f); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(info(e)); geninfo::create(info(twin(e))); @@ -560,6 +603,10 @@ protected: geninfo::access(info(e)).second = geninfo::access(info(twin(e))).second = f; + #else + info(e)=EF_pair(Halfedge_const_handle(),f); + info(twin(e))=EF_pair(Halfedge_const_handle(),f); + #endif CGAL_NEF_TRACEN("CT_new_edge "<:: { CGAL_NEF_TRACEN("clear_static_point_locator"); Vertex_iterator vit, vend = CT.vertices_end(); for (vit = CT.vertices_begin(); vit != vend; ++vit) { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::clear(CT.info(vit)); + #else + CT.info(vit)=boost::any(); + #endif } Halfedge_iterator eit, eend = CT.halfedges_end(); for (eit = CT.halfedges_begin(); eit != eend; ++eit) { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::clear(CT.info(eit)); + #else + CT.info(eit)=boost::any(); + #endif } CT.clear(); delete &(CT.plane_map()); diff --git a/Nef_2/include/CGAL/Nef_2/gen_point_location.h b/Nef_2/include/CGAL/Nef_2/gen_point_location.h index a9bbd396554..536ada6426c 100644 --- a/Nef_2/include/CGAL/Nef_2/gen_point_location.h +++ b/Nef_2/include/CGAL/Nef_2/gen_point_location.h @@ -33,7 +33,12 @@ #include #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif + #undef CGAL_NEF_DEBUG #define CGAL_NEF_DEBUG 17 @@ -56,7 +61,11 @@ class GenericLocation { point location. It can store a node or an edge of a graph or the special value |nil| which is used to signal that no node or edge could be found. }*/ - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif public: /*{\Mtypes}*/ enum Type { NIL, NODE, EDGE }; @@ -85,7 +94,12 @@ public: if (type != NODE) CGAL_LEDA_SCOPE::error_handler(1, "Location: not convertible to node"); #endif + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO return geninfo::const_access(value); + #else + return + *boost::any_cast(&value); + #endif } /*{\Mconversion converts |\Mvar| into a node.\\ \precond |\Mvar| represents a node.}*/ @@ -96,7 +110,12 @@ public: if (type != EDGE) CGAL_LEDA_SCOPE::error_handler(1, "Location: not convertible to edge"); #endif + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO return geninfo::const_access(value); + #else + return + *boost::any_cast(&value); + #endif } /*{\Mconversion converts |\Mvar| into an edge.\\ \precond |\Mvar| represents an edge.}*/ @@ -125,20 +144,33 @@ public: void init() { type = NIL; } void init(Node n) { type = NODE; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(value); - geninfo::access(value) = n; + geninfo::access(value) = n; + #else + value=n; + #endif } void init(Edge e) { type = EDGE; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(value); - geninfo::access(value) = e; + geninfo::access(value) = e; + #else + value=e; + #endif } void clear() { switch(type) { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO case NODE: geninfo::clear(value); break; case EDGE: geninfo::clear(value); break; + #else + case NODE: value=boost::any(); break; + case EDGE: value=boost::any(); break; + #endif case NIL: break; } } @@ -148,10 +180,18 @@ public: type = L.type; switch(type) { case NODE: - geninfo::access(value) = geninfo::const_access(L.value); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::access(value) = geninfo::const_access(L.value); + #else + *boost_any_cast(&value) = boost::any_cast(L.value); + #endif break; case EDGE: + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::access(value) = geninfo::const_access(L.value); + #else + *boost::any_cast(&value) = boost::any_cast(L.value); + #endif break; case NIL: break; } diff --git a/Nef_2/include/CGAL/Nef_2/geninfo.h b/Nef_2/include/CGAL/Nef_2/geninfo.h index f27c85eb19e..1a26b4fe7cf 100644 --- a/Nef_2/include/CGAL/Nef_2/geninfo.h +++ b/Nef_2/include/CGAL/Nef_2/geninfo.h @@ -21,6 +21,11 @@ #ifndef CGAL_NEF_2_GENINFO_H #define CGAL_NEF_2_GENINFO_H + +//This file is deprecated and something like boost::any or boost::variant should +//be used instead +#include + #include #include diff --git a/Nef_3/include/CGAL/Nef_3/Halfedge.h b/Nef_3/include/CGAL/Nef_3/Halfedge.h index b92186a7bdf..795578b10ca 100644 --- a/Nef_3/include/CGAL/Nef_3/Halfedge.h +++ b/Nef_3/include/CGAL/Nef_3/Halfedge.h @@ -34,12 +34,20 @@ #define CGAL_NEF_DEBUG 83 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template class Halfedge_base { // == Halfedge + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Vector_3 Vector_3; typedef typename Refs::Sphere_point Sphere_point; @@ -131,7 +139,11 @@ class Halfedge_base std::string debug() const { std::stringstream os; set_pretty_mode(os); - os<<"sv [ "< +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template class SFace_base { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Vertex_handle Vertex_handle; typedef typename Refs::Vertex_const_handle Vertex_const_handle; diff --git a/Nef_3/include/CGAL/Nef_3/SHalfedge.h b/Nef_3/include/CGAL/Nef_3/SHalfedge.h index 1ee884bdc3a..b5a882a4040 100644 --- a/Nef_3/include/CGAL/Nef_3/SHalfedge.h +++ b/Nef_3/include/CGAL/Nef_3/SHalfedge.h @@ -33,11 +33,19 @@ #define CGAL_NEF_DEBUG 83 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template class SHalfedge_base { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Sphere_circle Sphere_circle; @@ -199,7 +207,11 @@ class SHalfedge_base { { std::stringstream os; set_pretty_mode(os); os <<"e[ "<debug()<<", " - <source_->debug()<<" "<source_->debug() + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + <<" "< +#else +#include +#endif #include #include #include @@ -123,7 +126,12 @@ std::vector& Support; unsigned edge_number; Vertex_handle new_vertex(const Point& p) const -{ geninfo::create(p.vertex()->info()); +{ + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(p.vertex()->info()); + #else + p.vertex()->info()=unsigned(); + #endif return p.vertex(); } Halfedge_handle new_halfedge_pair_at_source(Vertex_handle v) @@ -135,7 +143,12 @@ void supporting_segment(Halfedge_handle e, I it) void halfedge_below(Vertex_handle v, Halfedge_handle e) { CGAL_NEF_TRACEN("halfedge_below point "<< v->point() <<": " << e); - geninfo::access(v->info()) = e; } + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::access(v->info()) = e; + #else + v->info() = e; + #endif +} // all empty, no update necessary void link_as_target_and_append(Vertex_handle, Halfedge_handle) @@ -396,7 +409,11 @@ protected: int fc = FacetCycle[e]; SHalfedge_handle e_min = MinimalEdge[fc]; SHalfedge_handle e_below = + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO Edge_of[geninfo::access(info(e_min->twin()->source()->twin()->source()))]; + #else + Edge_of[ boost::any_cast(info(e_min->twin()->source()->twin()->source())) ]; + #endif CGAL_assertion( e_below != SHalfedge_handle() ); CGAL_NEF_TRACEN(" edge below " << debug(e_below)); Halffacet_handle f = e_below->facet(); @@ -631,7 +648,11 @@ create_facet_objects(const Plane_3& plane_supporting_facet, CGAL_forall_iterators(lit,SHalfloops) { l=*lit; SHalfedge_handle e_below = - Edge_of[geninfo::access(info(l->incident_sface()->center_vertex()))]; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + Edge_of[geninfo::access(info(l->incident_sface()->center_vertex()))]; + #else + Edge_of[ boost::any_cast(info(l->incident_sface()->center_vertex())) ]; + #endif CGAL_assertion( e_below != SHalfedge_handle() ); CGAL_NEF_TRACEN("link sloop at vertex "<< l->incident_sface()->center_vertex()->point()); diff --git a/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h b/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h index 4d32ec743a7..f3c3c5a7806 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h @@ -25,7 +25,11 @@ #include #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #include #include #include diff --git a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h index 0bbeeae7f86..d556791b5cb 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h @@ -36,6 +36,10 @@ #define CGAL_NEF_DEBUG 191 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template class SM_const_decorator; @@ -116,7 +120,11 @@ public: SHalfedge_around_sface_const_circulator; public: + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif SNC_const_decorator() : sncp_(0) {} SNC_const_decorator(const SNC_structure& W) : sncp_(&W) {} diff --git a/Nef_3/include/CGAL/Nef_3/SNC_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_decorator.h index 7cda2e5eb80..e70fcd38e6e 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_decorator.h @@ -40,6 +40,10 @@ #define CGAL_NEF_DEBUG 19 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template @@ -155,7 +159,11 @@ class SNC_decorator : public SNC_const_decorator { enum {NO_SNC, WITH_SNC}; public: + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif SNC_decorator() : Base(), sncp_() {} SNC_decorator(SNC_structure& W) diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h index 2b5d9beb8b7..031349c7d2c 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h @@ -39,6 +39,10 @@ #define CGAL_NEF_DEBUG 293 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template @@ -889,7 +893,11 @@ public: typedef typename Infi_box::Standard_vector Standard_vector; typedef typename Infi_box::Standard_plane Standard_plane; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif using Base::visit_shell_objects; diff --git a/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h b/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h index b55aa9769e5..0a94a198b88 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h @@ -42,6 +42,10 @@ #define CGAL_NEF_DEBUG 37 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { // ---------------------------------------------------------------------------- @@ -87,7 +91,11 @@ public: typedef typename SNC_structure::Mark Mark; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif SNC_ray_shooter() {} void initialize(SNC_structure* W) { *this = SNC_ray_shooter(*W);} diff --git a/Nef_3/include/CGAL/Nef_3/SNC_structure.h b/Nef_3/include/CGAL/Nef_3/SNC_structure.h index 4977f1f5d7e..7f767760b84 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_structure.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_structure.h @@ -1212,7 +1212,8 @@ public: sfaces_.erase(h); put_sface_node(&*h); } - + //SL: in the following function, I guess the sizeof(void*) is related to the void* info that was + //used together with geninfo to store an arbitrary type. I replaced that with any and did not changed that std::size_t bytes() { // bytes used for the SNC_structure @@ -1253,7 +1254,8 @@ public: return result; } - + //SL: in the following function, I guess the sizeof(void*) is related to the void* info that was + //used together with geninfo to store an arbitrary type. I replaced that with any and did not changed that std::size_t bytes_reduced() { // bytes used for the SNC_structure diff --git a/Nef_3/include/CGAL/Nef_3/Vertex.h b/Nef_3/include/CGAL/Nef_3/Vertex.h index 11c5c8bfd60..1e9792c009e 100644 --- a/Nef_3/include/CGAL/Nef_3/Vertex.h +++ b/Nef_3/include/CGAL/Nef_3/Vertex.h @@ -33,12 +33,20 @@ #define CGAL_NEF_DEBUG 83 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif + namespace CGAL { template class Vertex_base { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Point_3 Point_3; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h index e7a1dae22ae..b674c70f59a 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h @@ -36,6 +36,9 @@ #undef CGAL_NEF_DEBUG #define CGAL_NEF_DEBUG 67 #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif namespace CGAL { @@ -74,7 +77,12 @@ typedef typename Map::Mark Mark; typedef size_t Size_type; /*{\Mtypemember size type.}*/ +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; +#else +typedef boost::any GenPtr; +#endif + // typedef typename Map::Constructor_const_parameter Constructor_parameter; typedef typename Map::SVertex_const_handle SVertex_const_handle; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h index b6c4a6b0939..7f418b32a75 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h @@ -35,6 +35,9 @@ #include #include #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif namespace CGAL { @@ -83,7 +86,11 @@ enum { BEFORE = -1, AFTER = 1 }; typedef typename Sphere_kernel::Aff_transformation_3 Aff_transformation_3; +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO typedef void* GenPtr; +#else +typedef boost::any GenPtr; +#endif typedef typename Map::SVertex SVertex; typedef typename Map::SVertex_handle SVertex_handle; typedef typename Map::SVertex_iterator SVertex_iterator; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_items.h b/Nef_S2/include/CGAL/Nef_S2/SM_items.h index a07bd316b0c..efd63d54c3f 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_items.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_items.h @@ -31,6 +31,9 @@ #include #include #include +#ifndef CGAL_I_DO_WANT_TO_USE_GENINFO +#include +#endif namespace CGAL { @@ -44,7 +47,11 @@ public: template class SVertex { - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Sphere_point Sphere_point; typedef typename Refs::SVertex_handle SVertex_handle; @@ -108,7 +115,11 @@ public: public: std::string debug() const { std::ostringstream os; set_pretty_mode(os); - os<<"V"< class SHalfedge { - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Sphere_circle Sphere_circle; typedef typename Refs::SVertex_handle SVertex_handle; @@ -202,7 +217,11 @@ public: std::string debug() const { std::ostringstream os; set_pretty_mode(os); os <<"e["<debug()<<", " - <source_->debug()<<" "<source_->debug()<< + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + " "<< info_ << + #endif + "]"<<'\0'; std::string res(os.str()); return res; } @@ -211,7 +230,11 @@ public: template class SHalfloop { - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Sphere_circle Sphere_circle; typedef typename Refs::SHalfloop_handle SHalfloop_handle; @@ -272,7 +295,11 @@ public: std::string debug() const { std::ostringstream os; set_pretty_mode(os); - os<<"l"< class SFace { - typedef void* GenPtr; + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + typedef void* GenPtr; + #else + typedef boost::any GenPtr; + #endif typedef typename Refs::Mark Mark; typedef typename Refs::Object_handle Object_handle; typedef typename Refs::Object_list Object_list; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h index 881bd5b22b4..3870444d656 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h @@ -25,7 +25,11 @@ #include #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #include #include #include @@ -56,7 +60,11 @@ struct SMO_from_segs { Vertex_handle new_vertex(const Point& p) { Vertex_handle v = G.new_svertex(p); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::create(G.info(v)); + #else + G.info(v)=Halfedge_handle(); + #endif return v; } @@ -85,16 +93,35 @@ struct SMO_from_segs { { if ( M[it] ) v->mark() = true; } void halfedge_below(Vertex_handle v, Halfedge_handle e) const - { geninfo::access(G.info(v)) = e; } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::access(G.info(v)) = e; + #else + G.info(v)=e; + #endif + } Halfedge_handle halfedge_below(Vertex_handle v) const - { return geninfo::access(G.info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(G.info(v)); + #else + return + boost::any_cast( G.info(v) ); + #endif + } void assert_equal_marks(Vertex_handle v1, Vertex_handle v2) const { CGAL_assertion(v1->mark()==v2->mark()); } void discard_info(Vertex_handle v) const - { geninfo::clear(G.info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(G.info(v)); + #else + G.info(v)=boost::any(); + #endif + } void assert_equal_marks(Halfedge_handle e1, Halfedge_handle e2) const { CGAL_assertion(e1->mark()==e2->mark()); } @@ -104,7 +131,12 @@ struct SMO_from_segs { void clear_temporary_vertex_info() const { Vertex_handle v; CGAL_forall_svertices(v,G) + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO geninfo::clear(G.info(v)); + #else + G.info(v)=boost::any(); + #endif + } @@ -500,13 +532,32 @@ public: }; // vertex_info void assoc_info(SVertex_handle v) const - { geninfo::create(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(v)); + #else + info(v)=vertex_info(); + #endif + } void discard_info(SVertex_handle v) const - { geninfo::clear(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(v)); + #else + info(v)=boost::any(); + #endif + } vertex_info& ginfo(SVertex_handle v) const - { return geninfo::access(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(v)); + #else + return + *boost::any_cast(&info(v)); + #endif + } Mark& mark(SVertex_handle v, int i) const { return ginfo(v).m[i]; } @@ -532,15 +583,36 @@ public: }; void assoc_info(SHalfedge_handle e) const - { geninfo::create(info(e)); - geninfo::create(info(e->twin())); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(e)); + geninfo::create(info(e->twin())); + #else + info(e)=edge_info(); + info(e->twin())=edge_info(); + #endif + } void discard_info(SHalfedge_handle e) const - { geninfo::clear(info(e)); - geninfo::clear(info(e->twin())); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(e)); + geninfo::clear(info(e->twin())); + #else + info(e)=boost::any(); + info(e->twin())=boost::any(); + #endif + } edge_info& ginfo(SHalfedge_handle e) const - { return geninfo::access(info(e)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(e)); + #else + return + *boost::any_cast(&info(e)); + #endif + } Mark& mark(SHalfedge_handle e, int i) const { return ginfo(e).m[i]; } @@ -567,13 +639,32 @@ public: }; void assoc_info(SFace_handle f) const - { geninfo::create(info(f)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(f)); + #else + info(f)=face_info(); + #endif + } void discard_info(SFace_handle f) const - { geninfo::clear(info(f)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(f)); + #else + info(f)=boost::any(); + #endif + } face_info& ginfo(SFace_handle f) const - { return geninfo::access(info(f)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(f)); + #else + return + *boost::any_cast(&info(f)); + #endif + } Mark& mark(SFace_handle f, int i) const { return ginfo(f).m[i]; } @@ -1395,7 +1486,10 @@ subdivide(const Map* M0, const Map* M1, CGAL_assertion_code(SVertex_iterator svi); CGAL_assertion_code( for(svi=this->svertices_begin(); svi!=this->svertices_end(); svi++) { - CGAL_NEF_TRACEN("vertex "<point()<<" info "<point()<<" info "<< + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + info(svi)<< + #endif " marks "<svertices_begin(); svi!=this->svertices_end(); svi++) { - CGAL_NEF_TRACEN("vertex "<point()<<" info "<point() + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + <<" info "< #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #include #include #undef CGAL_NEF_DEBUG diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h b/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h index 65f1e280a9a..824eb5f1a3e 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h @@ -24,7 +24,11 @@ #include #include #include +#ifdef CGAL_I_DO_WANT_TO_USE_GENINFO #include +#else +#include +#endif #include #include #include @@ -201,13 +205,32 @@ public: }; void assoc_info(SVertex_handle v) const - { geninfo::create(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(v)); + #else + info(v)=vertex_info(); + #endif + } void discard_info(SVertex_handle v) const - { geninfo::clear(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(v)); + #else + info(v)=boost::any(); + #endif + } vertex_info& ginfo(SVertex_handle v) const - { return geninfo::access(info(v)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(v)); + #else + return + *boost::any_cast(&info(v)); + #endif + } Object_handle& support(SVertex_handle v) const { return ginfo(v).o_; } @@ -224,15 +247,36 @@ public: }; void assoc_info(SHalfedge_handle e) const - { geninfo::create(info(e)); - geninfo::create(info(e->twin())); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::create(info(e)); + geninfo::create(info(e->twin())); + #else + info(e)=edge_info(); + info(e->twin())=edge_info(); + #endif + } void discard_info(SHalfedge_handle e) const - { geninfo::clear(info(e)); - geninfo::clear(info(e->twin())); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + geninfo::clear(info(e)); + geninfo::clear(info(e->twin())); + #else + info(e)=boost::any(); + info(e->twin())=boost::any(); + #endif + } edge_info& ginfo(SHalfedge_handle e) const - { return geninfo::access(info(e)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::access(info(e)); + #else + return + *boost::any_cast(&info(e)); + #endif + } Object_handle& support(SHalfedge_handle e) const // uedge information we store in the smaller one @@ -244,7 +288,14 @@ public: { return ginfo(e).m_left_; } const edge_info& ginfo(SHalfedge_const_handle e) const - { return geninfo::const_access(info(e)); } + { + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO + return geninfo::const_access(info(e)); + #else + return + *boost::any_cast(&info(e)); + #endif + } const Mark& incident_mark(SHalfedge_const_handle e) const { return ginfo(e).m_left_; } From 44853585b7f483bc956695fb0e4746eb1ba55a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 18 Apr 2012 06:59:22 +0000 Subject: [PATCH 079/102] too naive replacement: do not use nested macros --- Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h index 3870444d656..93ad2afa3c2 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h @@ -1486,11 +1486,11 @@ subdivide(const Map* M0, const Map* M1, CGAL_assertion_code(SVertex_iterator svi); CGAL_assertion_code( for(svi=this->svertices_begin(); svi!=this->svertices_end(); svi++) { - CGAL_NEF_TRACEN("vertex "<point()<<" info "<< #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO - info(svi)<< + CGAL_NEF_TRACEN("vertex "<point()<<" info "<< info(svi)<< " marks "<point()<< " marks "<svertices_begin(); svi!=this->svertices_end(); svi++) { - CGAL_NEF_TRACEN("vertex "<point() #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO - <<" info "<point() <<" info "<point() << " marks "< Date: Wed, 18 Apr 2012 08:57:31 +0000 Subject: [PATCH 080/102] Fix an error in URL Maybe we would like to encode the version number in the URL, but that would yet another generated file in CGAL... --- Installation/INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/INSTALL b/Installation/INSTALL index f35323a25a2..4b5b45a7f1d 100644 --- 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/beta/doc_html/cgal_manual/Installation/Chapter_main.html +http://www.cgal.org/Manual/latest/doc_html/cgal_manual/Installation/Chapter_main.html The documentation of CGAL is available in PDF and HTML formats. It is not bundled with the software but can be downloaded separately From 147ca74939c5ea69233ef753d032168d8801deca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 18 Apr 2012 12:37:23 +0000 Subject: [PATCH 081/102] add precondition to ensure the polygon is simple --- Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h index 7994b531c21..ded63d4ab9f 100644 --- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h @@ -135,6 +135,7 @@ boost::shared_ptr< Straight_skeleton_2 > inline create_interior_straight_skeleton_2 ( Polygon const& aOutContour, K const& k ) { + CGAL_precondition(aOutContour.is_simple() || !"The input polygon is not simple."); return create_interior_straight_skeleton_2(CGAL_SS_i::vertices_begin(aOutContour) ,CGAL_SS_i::vertices_end(aOutContour) ,k @@ -221,6 +222,7 @@ boost::shared_ptr< Straight_skeleton_2 > inline create_exterior_straight_skeleton_2 ( FT const& aMaxOffset, Polygon const& aPoly, K const& k ) { + CGAL_precondition(aPoly.is_simple() || !"The input polygon is not simple."); return create_exterior_straight_skeleton_2(aMaxOffset ,CGAL_SS_i::vertices_begin(aPoly) ,CGAL_SS_i::vertices_end (aPoly) From 52d230565c7ae384a869d69c73c235028b2f3f28 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 18 Apr 2012 13:43:24 +0000 Subject: [PATCH 082/102] Remove files added but not used --- .../include/CGAL/IO/File_header_gocad.h | 61 -------------- .../include/CGAL/IO/File_writer_gocad.h | 83 ------------------- 2 files changed, 144 deletions(-) delete mode 100644 Stream_support/include/CGAL/IO/File_header_gocad.h delete mode 100644 Stream_support/include/CGAL/IO/File_writer_gocad.h diff --git a/Stream_support/include/CGAL/IO/File_header_gocad.h b/Stream_support/include/CGAL/IO/File_header_gocad.h deleted file mode 100644 index 620b6e23c56..00000000000 --- a/Stream_support/include/CGAL/IO/File_header_gocad.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2009 GeometryFactory All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// 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) : Andreas Fabri - - -#ifndef CGAL_IO_FILE_HEADER_GOCAD_H -#define CGAL_IO_FILE_HEADER_GOCAD_H 1 - -#include -#include - -namespace CGAL { - -class File_header_gocad { -private: - std::string m_fname; - std::string m_color; -public: -explicit File_header_gocad(std::string fname, std::string color) : m_fname(fname), m_color(color) {} - - std::string fname() const - { - return m_fname; - } - - std::string color() const - { - return m_color; - } - - -}; - -// Write header. -inline std::ostream& operator<<( std::ostream& out, const File_header_gocad& h){ - - return out << "GOCAD TSurf 1\n" - "HEADER {\n" - "name:" << h.fname() << "\n" - "*solid*color:" << h.color() << "\n" - "}\n" - "TFACE\n"; -} - -} //namespace CGAL -#endif // CGAL_IO_FILE_HEADER_GOCAD_H diff --git a/Stream_support/include/CGAL/IO/File_writer_gocad.h b/Stream_support/include/CGAL/IO/File_writer_gocad.h deleted file mode 100644 index 2267c66e3a5..00000000000 --- a/Stream_support/include/CGAL/IO/File_writer_gocad.h +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) 1997 -// Utrecht University (The Netherlands), -// ETH Zurich (Switzerland), -// INRIA Sophia-Antipolis (France), -// Max-Planck-Institute Saarbruecken (Germany), -// and Tel-Aviv University (Israel). All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// 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) : Lutz Kettner - -#ifndef CGAL_IO_FILE_WRITER_GOCAD_H -#define CGAL_IO_FILE_WRITER_GOCAD_H 1 - -#include -#include -#include -#include - -namespace CGAL { - -class File_writer_gocad { - int m_vertex_index; - std::ostream* m_out; - File_header_gocad m_header; -public: - File_writer_gocad(std::string fname, std::string color) : m_vertex_index(0), m_header(fname, color) {} - File_writer_gocad( const File_header_gocad& h) : m_vertex_index(0), m_header( h) {} - - std::ostream& out() { return *m_out; } - File_header_gocad& header() { return m_header; } - const File_header_gocad& header() const { return m_header; } - - void write_header( std::ostream& o, - std::size_t vertices, - std::size_t halfedges, - std::size_t facets, - bool normals = false) - { - m_out = &o; - out() << header(); - } - - - void write_footer() - {} - - void write_vertex( const double& x, const double& y, const double& z) { - out() << "VRTX " << m_vertex_index++ << ' ' << x << ' ' << y << ' ' << z << '\n'; - } - - void write_facet_header() { - out() << '\n'; - } - - void write_facet_begin( std::size_t no) { - CGAL_assertion(no == 3); - out() << "TRGL " << ' '; - } - void write_facet_vertex_index( std::size_t index) { - out() << ' ' << index; - } - void write_facet_end() { - out() << '\n'; - } -}; - -} //namespace CGAL -#endif // CGAL_IO_FILE_WRITER_GOCAD_H // -// EOF // From a4e2f8d4f5a28f8cb713f5b9eace340b5e87d721 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 18 Apr 2012 15:33:14 +0000 Subject: [PATCH 083/102] Bug fixes in Mesh_3 documentation 1/ The requirement on the constructor of Polyhedral_mesh_domain_with_features_3 was wrong: the argument must be convertible to Mesh_polyhedron_3, and not to Polyhedron_3. 2/ The geom traits of Mesh_polyhedron_3 must be model of PolyhedronTraits_3 *and* of IntersectionGeometricTraits_3. (That patch passes the manual testsuite.) --- Mesh_3/doc_tex/Mesh_3_ref/Mesh_polyhedron_3.tex | 10 ++++++---- .../Polyhedral_mesh_domain_with_features_3.tex | 4 ++-- Mesh_3/doc_tex/Mesh_3_ref/intro.tex | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Mesh_3/doc_tex/Mesh_3_ref/Mesh_polyhedron_3.tex b/Mesh_3/doc_tex/Mesh_3_ref/Mesh_polyhedron_3.tex index 836aff7874a..d88a91a6168 100644 --- a/Mesh_3/doc_tex/Mesh_3_ref/Mesh_polyhedron_3.tex +++ b/Mesh_3/doc_tex/Mesh_3_ref/Mesh_polyhedron_3.tex @@ -12,7 +12,7 @@ % +------------------------------------------------------------------------+ -\begin{ccRefClass}{Mesh_polyhedron_3} %% add template arg's if necessary +\begin{ccRefClass}{Mesh_polyhedron_3} %% add template arg's if necessary %% \ccHtmlCrossLink{} %% add further rules for cross referencing links %% \ccHtmlIndexC[class]{} %% add further index entries @@ -28,16 +28,18 @@ detection algorithm. \ccParameters -Template parameter \ccc{Gt} stands for the geometric traits associated -to the meshing process. It should be a model of concept \ccc{PolyhedronTraits_3}. +Template parameter \ccc{IGT} stands for the geometric traits associated +to the meshing process. It should be a model of the two concepts +\ccc{PolyhedronTraits_3} and \ccc{IntersectionGeometricTraits_3}. \ccTypes -\ccNestedType{type}{\ccc{CGAL::Polyhedron_3} type with customized \ccc{PolyhedronItems_3} +\ccNestedType{type}{\ccc{CGAL::Polyhedron_3} type with customized \ccc{PolyhedronItems_3} designed to handle sharp feature detection.} \ccSeeAlso +\ccRefIdfierPage{CGAL::Polyhedron_3} \ccRefIdfierPage{CGAL::Polyhedral_mesh_domain_with_features_3} \end{ccRefClass} diff --git a/Mesh_3/doc_tex/Mesh_3_ref/Polyhedral_mesh_domain_with_features_3.tex b/Mesh_3/doc_tex/Mesh_3_ref/Polyhedral_mesh_domain_with_features_3.tex index 3c7ccb9f9cf..ff07014507c 100644 --- a/Mesh_3/doc_tex/Mesh_3_ref/Polyhedral_mesh_domain_with_features_3.tex +++ b/Mesh_3/doc_tex/Mesh_3_ref/Polyhedral_mesh_domain_with_features_3.tex @@ -53,7 +53,7 @@ instantiated with a model of the concept \ccc{IntersectionGeometricTraits_3}. \ccConstructor{template Polyhedral_mesh_domain_with_features_3(const Polyhedron& p);}{ Constructs a \ccc{Polyhedral_mesh_domain_with_features_3} from a \ccc{Polyhedron}. -The only requirement on type \ccc{Polyhedron} is that \ccc{CGAL::Polyhedron_3} should +The only requirement on type \ccc{Polyhedron} is that \ccc{CGAL::Mesh_polyhedron_3::type} should be constructible from \ccc{Polyhedron}. No feature detection is done at this level. Note that a copy of \ccc{p} will be done.} @@ -73,7 +73,7 @@ those triangles is a feature edge.} \ccRefConceptPage{MeshDomainWithFeatures_3} \\ \ccRefIdfierPage{CGAL::Mesh_domain_with_polyline_features_3} \\ \ccRefIdfierPage{CGAL::Polyhedral_mesh_domain_3} \\ -\ccRefConceptPage{Mesh_polyhedron_3} +\ccRefIdfierPage{CGAL::Mesh_polyhedron_3} \end{ccRefClass} diff --git a/Mesh_3/doc_tex/Mesh_3_ref/intro.tex b/Mesh_3/doc_tex/Mesh_3_ref/intro.tex index dd1b5e63f7f..62b6ec7868c 100644 --- a/Mesh_3/doc_tex/Mesh_3_ref/intro.tex +++ b/Mesh_3/doc_tex/Mesh_3_ref/intro.tex @@ -51,7 +51,7 @@ and their associated classes: \ccRefIdfierPage{CGAL::Polyhedral_mesh_domain_with_features_3} \\ \ccRefIdfierPage{CGAL::Labeled_image_mesh_domain_3} \\ \ccRefIdfierPage{CGAL::Mesh_domain_with_polyline_features_3} \\ -\ccRefIdfierPage{CGAL::Mesh_polyhedron_3} \\ +\ccRefIdfierPage{CGAL::Mesh_polyhedron_3} \\ \ccRefIdfierPage{CGAL::Triangle_accessor_3,K>} \\ From 8bb75c05863ff50293158a80d7f0ee191c2a4be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 19 Apr 2012 07:06:00 +0000 Subject: [PATCH 084/102] actually there was two nested macros... --- Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h index 93ad2afa3c2..f4277148e8b 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h @@ -1484,16 +1484,19 @@ subdivide(const Map* M0, const Map* M1, // DEBUG CODE: to do: have all svertices a halfedge below associated? CGAL_NEF_TRACEN("Vertex info after swep"); CGAL_assertion_code(SVertex_iterator svi); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO CGAL_assertion_code( for(svi=this->svertices_begin(); svi!=this->svertices_end(); svi++) { - #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO CGAL_NEF_TRACEN("vertex "<point()<<" info "<< info(svi)<< " marks "<point()<< " marks "<svertices_begin(); svi!=this->svertices_end(); svi++) { + CGAL_NEF_TRACEN("vertex "<point()<< " marks "<svertices_begin(),v,O); else @@ -1777,15 +1780,20 @@ subdivide(const Map* M0, const Map* M1, // DEBUG CODE: to do: have all svertices a halfedge below associated? CGAL_NEF_TRACEN("Vertex info after swep"); CGAL_assertion_code(SVertex_iterator svi); + #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO CGAL_assertion_code( for(svi=this->svertices_begin(); svi!=this->svertices_end(); svi++) { - #ifdef CGAL_I_DO_WANT_TO_USE_GENINFO CGAL_NEF_TRACEN("vertex "<point() <<" info "<point() << " marks "<svertices_begin(); svi!=this->svertices_end(); svi++) { + CGAL_NEF_TRACEN("vertex "<point() << " marks "< Date: Thu, 19 Apr 2012 11:59:24 +0000 Subject: [PATCH 085/102] Fix a bug in test of equality operator of CGAL::cpp0x::tuple Do not test equality between default initialized tuples, because GNU/g++ version 4.1.2 does not default-initialize correctly std::tr1::tuple. --- STL_Extension/test/STL_Extension/test_stl_extension.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index a7ab589d457..142fbd51689 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -8115,8 +8115,13 @@ void test_tuple(){ CGAL_assertion( CGAL::cpp0x::get<0>(t1)==i1 ); CGAL_assertion( CGAL::cpp0x::get<1>(t1)==i2 ); CGAL_assertion(t1==t1_2); // test the equality operator - T2 t2 = T2(); - CGAL_assertion( t2 == T2() ); + + // T2 t2 = T2(); + // CGAL_assertion( t2 == T2() ); + // + // Do not test equality between default initialized tuples, because + // GNU/g++ version 4.1.2 does not default-initialize correctly + // std::tr1::tuple. } void test_prev_next() From a40c0bf6a889f3343244565a19353f6d1aa4152b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 19 Apr 2012 12:28:12 +0000 Subject: [PATCH 086/102] A branch to extend the CGAL::cpp0x::get function template in --- .../doc_tex/STL_Extension_ref/tuple.tex | 3 +- STL_Extension/include/CGAL/tuple.h | 52 +++++++++++++++++-- .../test/STL_Extension/test_stl_extension.cpp | 21 ++++++-- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex b/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex index b366e999da4..8689874bea1 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex @@ -33,7 +33,8 @@ is taken from Boost. Some free functions part of the standard interface of \ccc{tuple} are also brought in namespace \ccc{CGAL::cpp0x} with using declarations, these are \ccc{make_tuple}, -\ccc{get}, \ccc{tie}. +\ccc{get}, \ccc{tie}. Like in C++0x, the \ccc{get} function template is +specialized so that it can take \ccc{std::pair} as argument. Two standard helper classes are also provided for convenience (\ccc{tuple_size} and \ccc{tuple_element}). \end{ccRefClass} diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index 65699b3c76e..c1ab51bde52 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -27,12 +27,14 @@ #ifndef CGAL_CFG_NO_CPP0X_TUPLE # include -#elif !defined CGAL_CFG_NO_TR1_TUPLE -# include -#else -# include -# include #endif +#ifndef CGAL_CFG_NO_TR1_TUPLE +# include +#endif + +#include +#include +#include namespace CGAL { @@ -68,6 +70,46 @@ struct tuple_element: public boost::tuples::element{}; #endif + +#if defined(CGAL_CFG_NO_CPP0X_TUPLE) // if not C++11 tuple + +//////////////////////////////////////////////////////////// +// // +// Allow CGAL::cpp0x::get(std::pair), if N==0 or N==1. // +// // +// That is already in C++11, but not in TR1 or in Boost // +// // +//////////////////////////////////////////////////////////// +template +struct pair_get; + +template +struct pair_get<0, T1, T2> { + static T1& get(std::pair& pair) { return pair.first; } + static const T1& get(const std::pair& pair) { return pair.first; } +}; // end specialization struct pair_get<0, T2, T2> + +template +struct pair_get<1, T1, T2> { + static T2& get(std::pair& pair) { return pair.second; } + static const T2& get(const std::pair& pair) { return pair.second; } +}; // end specialization struct pair_get<0, T2, T2> + +template +inline typename boost::tuples::element >::type& +get(std::pair& pair) { + return pair_get::get(pair); +} + +template +inline const typename boost::tuples::element >::type& +get(const std::pair& pair) { + return pair_get::get(pair); +} + +#endif // end if not C++11 tuple + + } // cpp0x #ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index 142fbd51689..75e8bbbb05e 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -8110,10 +8110,7 @@ void test_tuple(){ T1 t1=CGAL::cpp0x::make_tuple(1,2); T1 t1_2=CGAL::cpp0x::make_tuple(1,2); - int i1=-1,i2=-1; - CGAL::cpp0x::tie(i1,i2)=t1; - CGAL_assertion( CGAL::cpp0x::get<0>(t1)==i1 ); - CGAL_assertion( CGAL::cpp0x::get<1>(t1)==i2 ); + CGAL_assertion(t1==t1_2); // test the equality operator // T2 t2 = T2(); @@ -8122,6 +8119,22 @@ void test_tuple(){ // Do not test equality between default initialized tuples, because // GNU/g++ version 4.1.2 does not default-initialize correctly // std::tr1::tuple. + + // Test CGAL::cpp0x::tie + int i1=-1,i2=-1; + CGAL::cpp0x::tie(i1,i2)=t1; + CGAL_assertion( CGAL::cpp0x::get<0>(t1)==i1 ); + CGAL_assertion( CGAL::cpp0x::get<1>(t1)==i2 ); + + // Test CGAL::cpp0x::get for a pair + double d = 1; + std::pair pair(-3, &d); + const std::pair const_pair(2, &d); + + assert(CGAL::cpp0x::get<0>(pair) == -3); + assert(CGAL::cpp0x::get<1>(pair) == &d); + assert(CGAL::cpp0x::get<0>(const_pair) == 2); + assert(CGAL::cpp0x::get<1>(const_pair) == &d); } void test_prev_next() From 8d62b4b093827bcd210017dc26b5a144f628b2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 19 Apr 2012 14:22:41 +0000 Subject: [PATCH 087/102] update changes --- Installation/changes.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Installation/changes.html b/Installation/changes.html index 02f0bc7250d..59a783aaeae 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -144,6 +144,12 @@ since CGAL-4.0:

    could lead to wrong result when meshing from a 3D image. +

    3D Boolean Operations on Nef Polygons Embedded on the Sphere

    +
      +
    • Fix a memory leak due to the usage of an internal mechanism that has been replaced by boost::any. This also influences the packages +2D Boolean Operations on Nef Polygons, 3D Boolean Operations on Nef Polyhedra, Convex Decomposition of Polyhedra, and +3D Minkowski Sum of Polyhedra. +

    Release 4.0

    From 7cc00d2449896f8c2eca48d20ae808e8de4741e1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Apr 2012 09:29:56 +0000 Subject: [PATCH 088/102] SVG version of the euler fig --- .gitattributes | 1 + .../doc_tex/Polyhedron_ref/fig/euler.svg | 319 ++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg diff --git a/.gitattributes b/.gitattributes index fa0e3ffdd7b..d689dcc997f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3219,6 +3219,7 @@ Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet.pdf -text svneol=unset#applicati Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet1.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet2.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/euler.pdf -text svneol=unset#application/pdf +Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler_center.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/euler_center.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.gif -text svneol=unset#image/gif diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg new file mode 100644 index 00000000000..84dbd660f59 --- /dev/null +++ b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 41cef5c422b8120d80e41de27d03c1dd7a836a4e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Apr 2012 09:33:43 +0000 Subject: [PATCH 089/102] Vectorial versions --- .gitattributes | 4 + .../Polyhedron_ref/fig/euler-facet.pdf | Bin 0 -> 9313 bytes .../Polyhedron_ref/fig/euler-facet.svg | 929 +++++++++++++++++ .../Polyhedron_ref/fig/euler-vertex.pdf | Bin 0 -> 10814 bytes .../Polyhedron_ref/fig/euler-vertex.svg | 938 ++++++++++++++++++ 5 files changed, 1871 insertions(+) create mode 100644 Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf create mode 100644 Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg create mode 100644 Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf create mode 100644 Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg diff --git a/.gitattributes b/.gitattributes index d689dcc997f..fc340aa0b41 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3218,6 +3218,10 @@ Polyhedron/doc_tex/Polyhedron/idraw/polyhedron.ips -text svneol=unset#applicatio Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet1.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet2.gif -text svneol=unset#image/gif +Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf -text svneol=unset#application/pdf +Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg -text +Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf -text svneol=unset#application/pdf +Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler_center.gif -text svneol=unset#image/gif diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf new file mode 100644 index 0000000000000000000000000000000000000000..259c5fb3a4822b7944105a7e2597f60423d9aeaf GIT binary patch literal 9313 zcma)ibx<7Jw{>tB+#%QyoZ#*Rf(8v5+?`<<1{q)=xCRNqJp>8v7Th6t2<}dBcgQ36 z-k-eh{qvpbYFXWT?Y+)EUDaK+7}RCt*tt3Q0SvVVWp@BxAQup9ZVwO>19B=`IoY_{ z0{NaG4FC`bbhUDMIy#!UTFF>hfGw>65)uHYtBaKx2mnj3^-(FO7j@c{@RcpY zb`_xyZmp{(H}%u|;B5yp%WZ<2S+eKbjK6;m8=)os=y|kPH1GEoR(`5L8~%bN;sx>B z-yZWvUyj^9%x}}Ye;A#Y{C($pH~PDN(ibeg{2d~x|Lvi95+WJx<#1sf4e`#&IqUFy<0$@`c19^3Y(cw!Ta^Bx`zEz8%Te7gn zGw&T~!p(klmwq4+eJ6zDEg`t>-V)^wCKpeHOWHR^N$K6AF1OCF_FXQmbvBvL`4_>< zksR4CcbsN)LTXAhT1w9Jmp!lkVLB-3K>nCGLem_rl$8ALP= z;$v>KdB=50A;I{wW7q7JvJi-}t*hq9{kpQHzQJWUzWOSSJkM!x!5aLXrxcQd;U)c| zYexOM6+c_6PjxBeu(YQfW3XdNdF?Y@+gYJYwf) z9$c5u2nlBu02zQqYk5*iQ@M5oAjhJ?0w#adS@SLF-$!^@lN#_ClTKKWk*7(iUL>lB z?2m7u+gV}!5`Mh^? zK1+1Ew$PN^{wS1On)EYGocBmy{8g7Pu6;1KNxN5;zzm&fTUvyZqovppBht~>IMN59 zp>#PA_r~zO$9V(Bo%7NVi)Y>`5dMcO#*J}~^%NU78a?`y_ai2 z`XZ+}4$ZqbibNOi{=o1elmmIfCiR)T^+@S7Lk@Q9&BxabSH`4FC*A|{{A=&|Ai2~a zp0_JVMP_(s(!XfJZN}W+Ngg7(IVnbia5q1`^7R1D6F2Zsf(1Cg@ad;U8usn#hP`-G zh$cWzFPixEb0Fw~qV_qzzKAU6xr@eN5lt{^od-3fp`|lU$k&)lO$@a%3_)cYJ8BU& z2MGZD9R6Bw-i0jiF)zO^`buMVLaGh#?viAkOxb>~0$L!V40I>DLsZky+ffI#%egCm zmn+iMa=$zvYptC_4Wg3Pt-Bx}x-jhvOi1oRT0gXQ$EK01rA_UBlgF*)1*kb$turYW zHAs{|qI5#0is;RBvS4-lw_0*@4NEHuKIb>}h6zp(Ju?WCa)XphJ!kIzR+HB|%B z8>rPKnLzk$Iw~^4v4|YcUnSrbn9Ii)NSM-nsXBI!+x(1TUqfNtKZ@8u6!J=Dy>aT9 zs(r}i_|JnSp}CqbXsDG|=pvv}iXsLC{vlG8VFL1?s~F=8W^;i55KeuWjsI+L)F({w z+7f3ZIqsgSHoSb8q5WA$^d3EnH?AM~h4DF?gUXaZtayAoF>g3ZO?NpOW3s&gfA901 zI;kHVVN-l;Oou6|*drEruU1_l4erQWa{+t8fK1!T%SP&YmQ)KQzB!al?jFzzI}A4V z)jTZlER=3%r$ZyG=cy z2+0e*7Rur&x7=WzXCRwVdsu<#39umq|`!{xfZDj zqs|y+C6L_8=e%FAmwGMzKTZO=!YlA?D9&U|b(W)*e?N51vh0Ck_aNnmVyD{~KRQ>( z-NSvq`q60#zf;7|6g+KPUg-A(yXI}HU%TwPRzpIxnkO(bA7!j-9N{AVzHN=;XG=SS zytLHPV@}S4g9~E6Wju109&eLK!7t4Uc(qmB$yB1WW}x|1zleThJD3^XP;%U(rCJbx zqkPFj{M=~H_gBkjnS~)p^@uDunSKmhAV+cf-&b__%SVLVe)V#?Zp`5Zj%wD!V1{-lueC5DRH zdMuagmk7;|Yn;)@g7wVzFLSPO&%@hi48FW1T;;aOTs9pWTa6~e9WgrJK6$2-M^%n* zZIP z@E}nczx4be&Sf1*`K4HE#wlyl2oH-p?sa(r8cRB}Z|LdK6^qjCj~#~Z3!YV+SXO3P z$y?s;D+=G;GlxoXDRYdIsX?0`GwpZCh5b&VzmP*foc zmxmmOeBagGkut&f2`f$UM&@aGir*Chz)is|VP3SiN6Of=DY>xl{1BmJQa||qQorq# zuQW9|4JMf7myUAH(l5WVB@~)LiVt3C2!|T5J<#foL`4jBXdX;J0(soFo*(858B-ML`h{AH=0J&! zb$#_(@t>V7E1Df!AgxYO1hi3R?t#FMN3RkLW-V6bZYyasP$noS%owHVWoK&-0H_HH z(g+%2@;1@Lco8+^`6`8V#mTc*}1&CkfRtG(36}Y=gL!pU_zM8MiZFc zwc6S}AVKU%>aLA{FDq41{=+ST1D|1pqa4)njcf%a>RfCzKy@7vkWUuohyXmdf$q~s zCY0_^=@9Pn$++m^}KD9H_ES9^A;$ zo-rVijfV7?e{I9wLf&YhfW0p);>G3Ww}_2YNrHtc6oz-^eBM4wMi8wJtzwlA4sAjC z8AM%AIQ=~of54vW0EsG)m)-MQ(;mE)zoFxeFBhH8c0+b2^LhC2gC?U)64DHwUEVOQ zT{~jI)%OKUKoKi&1$yy@1dn1S!a`Ft+!;?t5MmJjXUzE91(1hNsDl1$$`D5VE@*TT(~dh4Fq!xM2 z_2b2dIg$r+{pbpvc#Y`Y+~|~x^AF8TN>t$?3p$82^obK2Y&QyBl4{fO?#x_jNkCL%)_i?{2 zRLbruHx~+7C>$m%5U0e$WqdVLK88frx~DgV3b`H zduL9mS4_7-c6~gb5mG%;7fpzPAXOpuni|3BF(7zgxYoS^g_}^I=Y;_*GGIg3L=|h6 zK9#QC_qFl&swld%pvH_zE~`WB4=(&TxTgAvL_s?os4}2)5Nb-lQqAmAHC=R&@rb@4 zBbPH1B4J%$aGJ!AwYuXzrpGjyRO{iWz3qb_FB|jtndzlUlLffLC=TsQns{-7zEcry zws_h$|GJmNp(!Psn<(2}8oq~^`+LO>#gI={v3HFf9SenY_sb8Z zSJun6sdQBH91@#dYocfqfKPAeyQMK^7s%XL;Mb^AsNK4(iQ_y$!W@_g2u8); z6(~b%4kGESoT@L@WhqccU%2i7XGs%2-C)-01?a;{0|gl#Du-ptZhG&}tjXYkZd1p7APomYu&Yvo^0~FqzcvlI7(<9Bh5M2Zu)MEdL&t^dpQ9VfsTH9D}3>DLx^GYhPME&-z0pmpMh-ler z3X>*3)wkhA9R;UrlEb|S!!gFw22%y%1t$n~7a3hv0Y8`3l$&8->>fT^f41a}wymk> zw)!s?B(m-H6pk+SN*s{D={+gOc;tEspH2p#k|o0Bw3nf{}a}l7;%S=fp+)FV~9-I_D~=xj*t^G%E$b z43qd$d4#K9uG5WM47P)!!}?GLMy~2|{GJySnUt3*3re#h!99`}_fe-lo9p1Je>{k~ z3RC;cXN)nQGv~<~L-L8dZy*`>L$^?B$uG6jKrM3lqi9XdNy2l^pX(c)SoS^~(( zLqCTY(I0?zD) z;;xSmB~A2&Z$gJwBZt*!qSucrfsX6h=GUu;GW&g=m&s5)k05_67saMrYoX~m)$OVd z)gG+A;9eEcA0&?hhKVM3d+~*OwF7D9rEFR^UIXr@E>RoJI9Yoccan9vglqzlS@ksr zCK&~atv@aCelcDJAwZ@t;On;2*xS8iR6yhX)0vfkl>BW7i7g>oH@2>_95`+N+hgsW zFlpC;{ogi`c^IjFa z9s%fb1}sYSkwK&~RCT2EpjsVU#taae%9g4tx>6O&hS5V+PP}DZw#?rPxUF^Ha^{)a zsW>^Gi7kZY?+OiN4uk~^|MJO<>4xL9lHq?6uklrVEJYjzCl6a&-*>ia15tC@ew+(sqC4?2QK6tBm$`^W186R{Dj5fTDP3FtG$I}O5d8I5 z86v=XJ-60UWFi`NCz7SG8qmku9>fY#pB_8}NPp(V#SR&_9hdsK*B#c=oS`l;5#FQJ zVuM&c;xT)U@hsHqIXK8M2~FSAGgE4CaZ#FR#fqF0R`d!gi!fj&_V%tH#U--MlxMl% z+r%iH2|j7bMCjf1kb}khQ(Lo>D>w%V@VSgiYu2fTb3anHHXem?osDx$2yH;$*Z*ps#MWX@n(c*pVBM<|l+iMU)U+3AtYQC+XtX02->s0Y>h#AHHeQD%?y%8HVGHxui9&LCUIDB7 zv#^8;VPAD2g{nTJ*o4ebG<>|<3hFCF>jl4R!(`>)bPdxEG)%5mQZYp-%_SLZRED-j zFaa!hj{}7}%iWM!&~nguFuOODTjPzG zXy--Xfx@21vqYNg?ehdH#p?!jiSifE&K_T%9wBZt;H*Z910veivTg>Rs|OkQT>D9H zj?0vxw(hHM8dnPX$kV5D7A!tA^|8(@Ai%3o&VGk#Ch?_@tow<%QCE_DGPxI8;9@kY z!NEZr@)dc95|LK6<)YH;QIW5B#dU8tn?9jFyyQfxsBEHmRArV=Gwt?0+u%1LIgAXm zZxk~`QUPlaM217PlAj((b+#;FX7SFhC8WHNyADpD!}NuI1nM{bCiX9l5Szm|M`AKGGvH({ zY*O#hCl`kZPa~fVWvmOFR-TdYlmps>MBPuwI#GV%P3209A)a|FftK#w$^r(*DTG`m{0+eB&SB}?i#|D|WxEfTBoM)5UhugHF=FMYhxiRu5cO={zn}Re? z|1j&~`qs4&%@a(qe4Ca}Q~a%k#Am0UNdUwbm{>}(5Txvjb_pfjt7Iq}cVA_92qhys z-H~8oatHZKESawnr9o2wC>%$4FgO*n)a31NqydjsZXy>-7mg%KwS5<@Yf=|S10I%^lbP#EeG}3PoKXZgt|;=s)S^5bS}qwR6aC;wJ%p%pKU|&3l9o#CsBu`(U1y zJI&F=PSvQ-e{ObrpZTJ+b72jtcb8r(RYqKh&RugwC)x1BwYSx?4@LD%-`-#~_t3j4 ze86C>fSo#+ZO0IdVS;V^d6hl%#}-F8A7r;PSL6!8|;ErxX+?P){DT0*gl(kRJ(SJP0MrD@FkW99oLBQ$3y6f>5~Q0y0X(8q-R z;9tT%g7xV1OKr>elY5V%)r1X>A8lo4{3Hsk^;#^34rT0!efr`Ue|JUf5NzcToZ$2} zyGPP3Z7Jz$NZ+UOx&TMxZBt(f>qU1**&Q(Y&WNB(`|!svk}pZ(XkI(t2eQRa?T2ci zv+UWVR+QhX&f+j{umo*yi{Euoi5^X2-~BXzzv_d?8s0LMHLL_h^M-zYVY6jQ#Vx+C zH0c0YK)Ux-y?}D|j(X)alGGpZWvud1P>)xx14R3LJt#G$31{k#Fj5 zbjTI5gLV){*`Ctr$Zyrz$UNL1Rr3{ONRVSpb=D<}s@N>ZJ`Hi@{A}pZnB$q5a*LM$ z_W2%E{uvmMwP7#Z*^}WF*oh$}-Fl9xm)c1(S%y}1#Z&bLXDvz6CyUHi-Vpj* zHHm$aQPw{GcvJzw;&_BlG&uhV!VKN_W7(rq3^HzV$S|+Q`WZO(+$$tOr1&-==`j2h z)OeyZR?E{erz<_lg`U+QaHi*C!uqYHlW>3rz$R$Dt8K>Co1tjW8aY`RQ)$Dth-7x7vE}G8aYMF{6_;$emS`tluG-Eob2DL`yhb zbJAo>wn#R%$X-X)@btL(=Tf!zb9$6#M$+iZ`=1P5O`c7Nxel)tZ1--yx{^|8qRk@b z8t|TMno+(|yDj$Cyp+5mCe^RteYh9GtQkk5_No=tT_oO#QJ8kE;(?^&RHapJd4ekxn+WS>Ej=(uFAz|^6vuB~B^d!aBQZ0KAPh_z= zP`4ESRE1vA?uxBXRXq1kj zejg@OGS@k{gmzFM>CHs@zDWr6a^mOsU8NSAd9St=V($rlMg)MU*gbX4+DfEVT%sCG zFVE{p`^7+`Nd$n#B{#tKRoz(An#aIJEe~|Rl?SNdk=7@iJg*CX8>&YX4{y?@OM57uQIvl!Zb z@Zz+0G@LJUDRFi3BPCAIG9Pe1eSDpb%xR2K7dqZXzB+5o(K8k+bz`bc`Mo}1sMcDh zxqR^H>jr+pDrpRde3AftqZT%OZxoI;UD2`qU5khG<)E4arn}$?&V@?sB-i=)H6NRRV2jkH(wHrea_O?>vPU$Xu zB9FV)nUv<+W#we2#|&{Gmu%TBeg98+R6kTIVdzBhx3fDPfsaKoBP_on{V!ttx%R@g zH4XU{gJ&Cy1_wr`)ztTI7vPI_!LihdZ*-~H8B_%%7r?MPT~HNdjb>+a9r~qQ;-#yZ z;5Ij_gj;OFS2Zv0-(OFxx_!E*1KbETP2@%IbN1BNR>K5s3M5GU%STwGlW+2D8x~$K zQ;V-1M5~5A#-e|F-+ePCw{T(AMEA4omo$r{?ZWa*RD90+QhypdJEIe}=Xx#m;y1KA z@yn9rnMu@pGZ!l-*Qc<5xinO)EbYvs z!7!k~6T}7N7UJa)l%-Pn?0?Gk)v0-8PD~-Af*wW47$w_4 zzw3W(=4$2$w)va-sX@?x+VY z7(d_B?EPuQV2jyI5g8%>k literal 0 HcmV?d00001 diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg new file mode 100644 index 00000000000..cde3e4a3371 --- /dev/null +++ b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg @@ -0,0 +1,929 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..baca524996d78608871a466ea83a55b7d83aff77 GIT binary patch literal 10814 zcma)iWmFx_wk_@+TsN)(HtsIL3GNQT-QC>@8r*_AVdD^7g1fsr!L#9!@7#Otx$pgX zHF{Ka&91d-t(w(6s>hhr$`Vo^fy|sp)XnELFG%bFR)B+vHIje;fJNTi{)?+6fa4uf zK>`2(EK*jsuIA3~t*x=ExrDi?gPA#!kPwoKtFyVW9g=5uiJw9OHGllNkpF-_I_q(w zSe~u}9DYwsrZ%Ag{$dR?erAjn%b$l|E@<=vznJDKD+a|q7CwhkMHkXVn;pF#CXqf~ zUIzI5Nq_Sadc6-wxD9%H1sjqc>R$5ZE$+T)FL$rJy-r?lzD17-(GK$zFFN} zT?p?g@lCdHNw=NsJ~=f#r8#@g&AyHg4HbQF(U~n8Z{Zu-1y9#EFNF35b($J`;7a#`61)F$uS;279x>=xoe9* z#Jkl8G5NIew&nxITTwE#T*Vcw>|Xfyzw7L4ROpzgOw7hV6kDNeG3pzZmg6mOW)5?W zkR>cov*P~@t-@JgeyVP|UQOAnUNmvZ^*EJ6eyv)tOMKda@vFHaV`-vE`6@l;u*loQ z1X0_v22jHP!Rb9@+2_bs3Z;DwnGwXyi0z4Ga9*Fg?~kdKSuiKtWKx?;Gm(03_G06h zotkqGH#dsVpH6NUZ%3hXlE0~u8PX?xtEV)(itp>OM98fchimh_kfg|#uk&!^JB>;L zGzTHuXw7N82>1H+THO+zh=7)J1Bo)fP5$?0)3;GUB*Fzw5t0x2yGqVnfh+9r{^-6- zr-vB~M>+F&gZ+i)YLRexCN)#454@K)XQT5>cIeo#^euJR}pF1A#V4dzSBvca|k8BDfwgq%0bJp$76 zV=!SX4^0@G)ZhMC6>^B0l_E?;b;jFlg!1STsX<9{m^_QTwWdvcKt6Z-=*KS~rI+IO zePlj$Q$_m`96p&G7E{iJVJZe=Mi}2j@J3=Xm-;LVT1iul(Zq#=53*f^8vT`FC%BJP z5@_7euq*m8=p0@4jxo0yL7bO#Be2(`;+M{l$#Plrz)xnFs#pcoozSOXYgkRHL1j%r zcyA~r^@G__W20kHYZ7W^3Hc7ZNZK-;+7h1VU;7>O@iC+PxhsJd+HGUBqX(^Oze*Ay zZ97=qh+ZC7^^%S3Qb})yb9E-Od7^)K*v@*=IBTc}@oX^e-!)Z*&x%E$g7g(wZm-M3 z?LtFh_bNcaP9lXSv8%JP>N_wmFf!xaXp3eoa%8xwVs)Ic^Gh2f-J7ggw59&^wgueZ zgi`QAv{2AcpD0{?o%K66SzC3*)%B$|Fa-(5)hLnWln6^SUm-iFMsnKDuY&Q@T+GR* zM5TNQe*k|j^rt$+fQZm8F`HfDF^rUKbob5^8hWEgFg_qWO}*4#DB*9wImkROk(QxxuUv4 z3#O8T5Vvr9e&u|7O1u^U1}J-df${lFgEOZP&pUu4*kP#0e)B;uUe$)`fUT}L4d41Q z{#W=RC_jjg%Lq#jSJCQ{@ke`W(^Dn~NoR9h0$rfhnmvo9e^qVcZ{^T@GsY388~L4# zKE7I3HmNqoC|Xv|@ndkj1T?0q9UD&_KYBTwu6n!q@eO36r%>i2}+yzLukm;Ix0-ME`*AiHp#v!4t#q7tKxV(MCEt!eFH}iRGF%clswp3rmkX@i9Zl;QHic2jJXY25t!ZH(uFlK5j31dSD3Lp{utVwehI~3GIVAdYf!4dYn^vV--IUX^ zX(}0CEKxhqvV73Ipa&XojUKXkf{qA>s`9nr5(-uv4(a%jJ)$u3;xTH&Go8M!I6kbHSiidmRf2g|jv;outoB+jI6hEMy%3J3Aw3*5r0 zR0BHn7hz9(J;x2M;gCv2nIkL6g)nFf;q22rE|z7T<%cX&F~_GzHZQLJqDHw_>cK<& zx@F|on%o;@hW4i=Yc8c_LK9Hb|{S72xv#00;bG?3Kq0I$p12|Z^qp@sH zsEC6wFXOt?>|V*WpUl(Yk=rLchk}cBCOw6S-!*j)2JE#}?H@st6;5N_cIwXa6wTl3qh9`n9ATt1ughQsq zK+3tg;yrCo#!Vu;hIBs^Q-Ym9{>}5$lU0OIUltqmW9r%{Ei$&oK%&D1VaQ*=O+G9> zVY*g*L%cG^O|BcAud*c`uj}|}lFFa|Y}`|`jtm`p>beY8f^Hv0KXt;4s=DzpMQD|m z^E?IKtV2x6;@(SIG<_8b3XMmC;~ojivBqWpx+DElQa+s3qiB#j8Sd{o81$a6xHKI# zc07fE1Oh4S{PylTPbgA0*}R8Cd`ugMZsHfx8~Uc5+LVwkyF|&7a6yDm9u}pGpPA+q zgQp><^|Ou}s6zR%Km(`hzf7B1c zGIao}zNBX$s!3mA1r@fMiB=zqH7W_Q&p<~A5zlcMRQA|$B=G^Bj7kVm+wDZWS_YN8 ze6~a&jlmZ5Fkg)W{bwFA(+V8N_hs$}*AB-&dKZYb>u%_7Wi^VzCi)T+%4#M?S zC{_quPF5>^3&3)1UE{h_%Ag~i)Ca_MRTwtOE_ZmcJEKH&`PC=%bG88n;y6FdPX-#& zz~8DbZM0tRyop3_w zxacn?VTW{n5U2kXU8%9I!gg!T&o-|V;Xk;3Rry(7Q;^gA!@A!lOU}MXCrK9uq3!bO z6Vg?QYM>%E-4(mIz$H@0r$k&m#!WeitCwAkd`M0bcoWb^Mb=(19AfUYyD1w(q~I{Y zwy6$xcc&_5AJ_7f35MbKkF7zVApDj4%v6T##yw#x$09*a%E_0p%5_?agNcXQpD%IK zo{umB%D27Q&`Th#20aPBy2WD#ubj;ohZqK)VpDBhW+tm6a#P`tacpV;O=0Gj5j zgj`t?QEaM=h*Rf{Vi87_N&MeNZFd7kx5IlT;$h%ejPj3jmcU=)Q(me;hb0oa{EB(< z0iQewWPUK}Ta69hm|2p1%%D#hVvuQIsD55f^Ff?SfJ~(o#-8#>rTPfBFCed@8U8Yt z#*`@y9jD6`OUhMyOQM&>T}JWw(Pp@$!n(I4r>xuCT#-u9C5u#(iearAIBlAlgC zU_o%k&mqFB^^`EABGmQP>Sbx zr%?aeq0-;dDj#c%mM5pY=n|@=obLV^Ae;^piq;urkRkyg=la>9((K%x=jczYKSB08g~Tc&Euh;#oJk zMbS0~+HJzX))>{>$X8;c)m#O>Gs!aj2SR$j=TcGW9>8jXTe&dGU_ zCi$hKj4^^^0-E9=B4a?J)xtV|(*(qY@Xf`D$8I zJQ~VOx((c>U5g&2Ozm|}%< z>r%XwyIe+n&-qM0XCpWj8`>OuoME&o%lDBj)4#6fCw_qF9Ck8UZ0AcEnCn3lh z{XY7xB#+PvBUMUYpc)7p`c~)TV;(Wf|A-j`2rux2M|C8xD7mb<@kX-<}}{U-~6~ z^%{f1-%rL(#VN~dK0&BOj?BjQz_xsrJ!E;$kF1pp;ZBICi_^?MR8Kd^6yujpG1oNG zNxkz79Htw4(aSVXVvuVFivo{w2U_^)=qbCDa0Spiq=2gIf!eqnVa+nQZBsm+ zKIUBOAkk%1$+=3|CUi|T=S4lnMZ_rg|zb_4S9>WoYviU00fftW{+tl~YE6|4H^!c>wZkgip z4F@L1vctvfL@702F?fEH>*kVh9@%y2jE_a)RnW|QN?!R*g)DtEig|RD)VZA?{Y4JH z`K%3ibbNz(HSb&viP~_sgz*FxdOrLa!ygwv%EAK*tIC=s5?Rc_%u^=J5t3>c+v$ zAb%@O#bYFWE*~MH0V1F5%g}_NF({(}mwuW#@>8E{VYIye?Ln`nfJyEzwRN-gL==A1 zrn%9tT@=WRr=K#uh-u15ZUbnM;hxTh?TsW@f!G#yjBaL5Qk!`w%z3t^CCw$*sG}mb zQ>7!7)6cga0aB|T{}~(1(ry6w+Qyr-0YQ~^gT7ycV94^(lyDgzeE#J^~v@{FxaB%d<*=P@=dIzKbgv`?&~TdlOq#; zAJ6PFQl|W<`@U@54>j^lW$485m}&Pi7wTH76@+?0iHLfVak0x?^tvXD201gC89FEd zULeZ-$6{!OEveMkE=SFSV6r#!jY7(01lI`2g(s~^3xf(JC|bkusxBON>JM{EoOHj{ z$1i{jvYR9RC%SAMAL8Q$?@ocL@C@r!V=cisS<#n;6VPpVIONSpor7hHNfk30g;T%kM|PQyb_x3b_|zVyvpr=%u;@mpO)H_a?< z7`-+hbwk1BZ2DtL{!i{84MScuxiM+^74s~!gelFW!n)rA5&OZClHCu@qCYX>)>Y2o zB85rT=HjRBf_3K;mTt>Vq?golI{-t`REcT;;D8*L4W)zW8h7vIFkQaAVVl48rHj5W z0X4GSMTpi;jl)(vcnKAY?xlJ9B{{EPvyxpJdH+T)^p=?0jf~pE?=4C>>_NZ#KtNE> zw{d~o!GA`ShfvXDaW#5jcP@UJtl5)i9UTV~*t1rHN zhIy71Zaa#19Yar)(epTi?_vx-jr`M!IiTfB>QvD!N>DshEm4rkIH93qgr|zq3%;m+ z>D@7LS1cVATq8Ck4V^H-6rZfmp_|J)j)pVq;DKNLO;63vUa_KC#TB7h zBzEHY${I*pOOg-6%d}LbNH}>Iyvqf7ia-@kBW#2|Np`DGjV*3bHEIScJ@0{v`0CC$ zoq_WicpZHPyl`-nTvEkHN`6>v&7A&4<%H0;tpSh=8urC))($m_|@ur^AUT^=7wqtOLp)m;4WdQxOy|Ve!gv8YmPaZ#Q)@ zqB`2M-6_gl!^K|8dLKbmlnwZ0)pHH%`51o2637As*`W;eNSka(!v}>2bLDNfhj4Rg&=)TVMmnRuczck*hc67+JcY zphe`#FG=n(9HtE(5c7A}sw#JnXu(U^dJXBv3ZGO#!=0aw?SeQIgI1bIR z7db>)Z~oDD+Y?7+eOqZ;kQ}l@|#|ZQpXaSCfPp*|BG8MP}7}JS0 z4GN%7V%JcL74hH3KP-KqfIfQBTm}zZDJ*53sx-MQIr;ulSz%Y(a#~Ti z!)wLuGUu-EDvUkdQ{J1OH)x2(%BPiLl26r~% z=6Ax-OFhNT9%>tJ&qdTWx%#gkpA)*@P#;p~3`luf#~K+@1u0FIyuL-*VJ=hs^we%& zBO6|Ycfw(W`U0`{2(&3RE&OUY0%}%dj!U=7cA~o&t=g^T`5~^^o%}OR5!lL-;Tl@a zvX&2hNc%}5jSeL?Dn@tI7E~ye$1zty%rJZPs7S=!O+{0{CDF%7BKZjuBof-Go|H?K z0)^MQ)wtVRjjZlUK1AnQ07O>EJDilGS3)WQc9%1*C0iwMAyVsIihFUVD^PU#si9HF z*ZdiGj{dM5>L3yzw&RF{+Evh}05^p+ud|KU-sFt5(;3?ke7vYO6MT+M0$u1pZ7LGy zMluW4t7vpNmXM@ZiBt07i&iPBz(A};5r$dzr&t^NUQ-qMOe*{xWiIK|No*^^DA!Yp zA{dt_55cX+6#0+4(5ra$-aGMxRKf~y7-J(v31}?q-DsdkNM2^-df_8%Hkj7k!igpd zG>b0+zG0O7h_Wi>LLpTxs^6R=E3ww^P>yBX&6=0%QseovedTr@E@2sQ7{6)0WguwG z4j)Zf<5GQf&Sac@R$*975^#ku{1lhY!gE+0YCkkF zcmxl&Ty@r%OP;BDDK_u5To@S|oQE_b;T%VKm#TD^+~H73M+qIh&6Z%9TuxJ0 zQIxUi=qDsf>PTo(g1kfBP1Q=SC*Ga5rKL35ZE6QEwyNdu!(rkDgKkftY&~p}2&ecS zVqkM#m(1Y#q?`6Dh<_eZGUJ+_YR^~oPBGgOcQgdd=#~)D|o* zDQ7zJk7{}Z?p*ZA&q;3$y#a6OdFu)Xexgsmbqx_5oVL9U5xV+wbn~n`^p4HEA&yC` zRM!2C%*pNO^8AxgG?vkv;EtWZb4q2uEr2ag3rr!Mi}voHIzvV$IX~?ywHlPH0hFN! zJrsVHYG*R(5_ynVZUkhUZlnW=^z{8oq`-~OvR+PLmpHr{(>q)mwc)bhQ9_K%N>@Wf zdipFdk^F;3BkqPZmnL(`yzPwU9(J4(=WEt6UYBa<&+5_u;e7J^ZQI8kAiDjB#rAW? z{nxLDCl!`4hWf^GlrbKfPOWR-kywZ$5SKiw2^^vsqmD_rWC$3Enbl{9VVAMGdmTBW zD_6ZY<92Skf$o(!BPoj8Heq;3w|mb_nOV=!-`ofHy#^AZ(hEJQgEP866>-P#Uo3s+ zKGmGBwx|^F2Hd#B8Dd0>eke1Fk&3I73^mb{QJqH~@+*B#kPUk-^h$O&R4}xu?qc}K z+IG9^5|_>hzr9?i-z@)z0HQDACJ&50V7S+;&feiS*~MbF;hY$_u5A!g12vZbp~Y6HcC(#Mi4}FY)vEfhqM>?ua27Y#Xq`h@;kC zrRc7;O(y3sdmdF|P#zeaj%y$lGzpKSkm{n$s^1`{W}m&NPmj%XN*U0#aQ!{qz99vO zAE}$eq}}Qy)P|2TJJSBB^EBk)@M?=UXO}g5c~O;<#4JiWQWMc7iICs-$7MTavyIFE zlYUC|VSJxBQW{gjlX&(*=`&{{p-^rmKqyK?f%Zu8Otr=Sb;0rp65%+JbZ?Q4m$eIL z%4+y+*|JcG1Qlr>(~Tz8zKO0s1TFT5r#BGTR|%)mIOKv;H&#ZkV?Ym1sn7E6iQ{)< z@!RSMVpM^-8|Wmk*1|^HYBv=s1$1L-Q0p;3yI`L`30pnw_9+cLmWp~TXZr zy%cEorS|e-F^PJ#e;yPoj5@W&7{{T0^8n}@y`WT?y7fT?8CA7s~o@pg<{msC5^~D&bXA$aqCMAp_E6PxvS-q2# zIt)UF`DA$5URI#)Kpq#(l(a&DY0Ftcr(x|0N2l_iKd!p=LW19<+wX$eqGnH;9xGR6Uxx`7cB$EBxEe>@KFe}Z&r-IBMAODB#)+Ld-XW{4jl z*SGL4a`lp=_I%X48wyg;x6v+~aKG@3eUADx@Y6MqQGW-4BSw!OP9u zN`*JWoj$~Dq!>hunQq7qJjxw+Dtt(6Wj!!qT@p_Z=y`NCHGSl2?bLt@hoYgt|aU9aE<-ly5HhJc7IkBk%~-6 z(#rYwd=52!uy1RK0dc7d!&+O?g}Y1a7Ns)~;zM7HqxF|bs>r3#^I3Kkb?~=(0wMRU zs!Gy7KACY;`0?nV@BP|}os$QNau3mT;W1m@Ckj9@b`5b-GlPWVBqxH|2YQ+3Df&J9 zh36aACD~NBi3Za!E~tSaf_QX8sn6;LO_rd+p(F9~(9`k;89k1z)%9~JXGVUK0zN7{ zZtDPvw-)G!nq3vvr#&H~nj2{L?FS-e*WBK3Fb*C?lcN|ydwuEW+C8s+TuhV&XZ{N! zR~TuS+zT{~_8rh0@_kCVMbdhNAzAD~yS_oo>*SzLgH3%JN9u6OygyP`5kh#(#Sh?k z+RX#lZqR=IO!0oIurp3$Ljc2K+eMzRSBN_Iz8*Nmq=1&BsRP?d@ZgK@6xMM#)&Wa? zq%XSfBmPPGX+a{OHs19xH3Mg<6`JUEAiq!*pZ6X8hY@YDD; zAW>D=1tthfsIoy@85;pXTapo_KRDLa6*f4~sXPHbcnY75U4se%)@zOg3CatxOJ^V$ zgW4fyf)O3Qq{0SSfcR_0CNTNJg#>m5OASPW&FI(riiCUIhWvlu zqrK*H`kI|g=T*_)Urj>p7{%>1>zY$_Nx}>(_XnsfjOt>!vQMk{8~!gs{-s4iRA>0BEU zKzIvO}4r(rE3SG%@YkorB19mqePAvDOZa6YG#d`Ev)qqCR`2crc{Px5)4U=22 zRk^){8D@p1MhrP2OmECg02a662ZY>a%om2%fg~rYirNVXrIe_QhlZ9ACv7v&fgW<= zB6AbEzHh|1ALTz8QJ|+9wKipHCQz*-{l5J~2g-O>O?ncuM8*OM*&`ery5MCH=X|WF zgeVC3spm=D)BDBk%Ty)5{O=W)H=_Lr*wO2cphV3KV^=aj&6h69tOw*iyMs8$S!ixG zA_g4cCD<5#vlp?GI0DEL#VrwMwxz z)DpxEt{4#EcVp0>^1t80b;KS@3dd=f-Cjfytow1~N#3m*9zgW`FJ+W4w7Wv%rJq^k>#j@D&sD-O?C4n$H$tIdI7guC zo#+X#fqIJ=-0MVLXKeD>Wr1#5C$fJ&w7&-1;J6D9iB$I ziMe>{!NukPI;Jd~cbxsA(r&y;uF7aL=2w0z%i#Y@&c9+d;kwNiuSQh3|9Tj=m8Dy@ zyoH~Q9ml<0+^ea5A2XAAvs>eNOaY>MeQ>i~c@3w1^mwA=HKu*aKfuBC5i`PYWzczl zgk-aE(*1kBPvEmA{nQKDj;w)UO!r%qmq7Ui^Lofty%GvTVC0nVLi!r==#5tmROyj8 zTVb33vneMFoo4S8_pYzO!y>nQ6peOi0Vd*9K?`EL+C(<6qTuDBmZ#}J5#GkRPmo9Lis(wtl`tV+e3PAIvasio zWVCFkOHx7@>V|k{JVg&Nth7XQ(T|9vqB|0E4O=I{AMQFbbx zIm_3#%yFL&n8BseH+o))zXz?G_Pl!{aim2<3yRvLvx=T@A{7OtYKLrom-#Yvd^7x` z{6OeGbuacphPv4dcd<8nH?sN`96V(uZ+jKMztphkj1Qd0`s(iL-9GtqHB z(svWNvTvUxK#xyT4Mn zzxubo?YjbwmzRy}?|{Euwtp+-{?W!sdb&!hy1wh;00IJkf%n2<%=+E|u!xHSfB+U# zVJJZ0u}q@A_``-vT@Zb2BSrF$Yh8 z?mNT^0P?UibF=dDu=4_dtgOsjygWd5PJsSDw&D)c^KhQ;4;33GQVQ*#w*vA^KI@?cRhcX4oYHZ^wv{9O%| z|H$fZ%>S(;{GY5`{s~Ra%FN|GgTINZ{5x8=zlr{b1FrvYApWi|baikB(3u)rIXeJ= z%s^IVHUOQatE(d)%lpEu5ztGeFGmWydgPEJ@yI%4C-|T-_;r@^5 z{}sQuv8%DI!c~@qcX>8G8!{z+W2v;nl^}*xB`;41uhi+(0C1YDpz2r2hjq Cia50Z literal 0 HcmV?d00001 diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg new file mode 100644 index 00000000000..5201ecd87e1 --- /dev/null +++ b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg @@ -0,0 +1,938 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 579a606a752d626d3575921d26ec81ace943fa97 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Apr 2012 09:35:35 +0000 Subject: [PATCH 090/102] Rename - to _, to have same naming scheme as .gif files --- .gitattributes | 8 ++++---- .../fig/{euler-facet.pdf => euler_facet.pdf} | Bin .../fig/{euler-facet.svg => euler_facet.svg} | 0 .../fig/{euler-vertex.pdf => euler_vertex.pdf} | Bin .../fig/{euler-vertex.svg => euler_vertex.svg} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename Polyhedron/doc_tex/Polyhedron_ref/fig/{euler-facet.pdf => euler_facet.pdf} (100%) rename Polyhedron/doc_tex/Polyhedron_ref/fig/{euler-facet.svg => euler_facet.svg} (100%) rename Polyhedron/doc_tex/Polyhedron_ref/fig/{euler-vertex.pdf => euler_vertex.pdf} (100%) rename Polyhedron/doc_tex/Polyhedron_ref/fig/{euler-vertex.svg => euler_vertex.svg} (100%) diff --git a/.gitattributes b/.gitattributes index fc340aa0b41..38d7151d460 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3218,18 +3218,18 @@ Polyhedron/doc_tex/Polyhedron/idraw/polyhedron.ips -text svneol=unset#applicatio Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet1.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/add_facet2.gif -text svneol=unset#image/gif -Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf -text svneol=unset#application/pdf -Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg -text -Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf -text svneol=unset#application/pdf -Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/euler.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler_center.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/euler_center.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.gif -text svneol=unset#image/gif +Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.pdf -text svneol=unset#application/pdf +Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/euler_loop.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/euler_loop.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.gif -text svneol=unset#image/gif +Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.pdf -text svneol=unset#application/pdf +Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.svg -text Polyhedron/doc_tex/Polyhedron_ref/fig/halfedge.gif -text svneol=unset#image/gif Polyhedron/doc_tex/Polyhedron_ref/fig/halfedge.pdf -text svneol=unset#application/pdf Polyhedron/doc_tex/Polyhedron_ref/fig/halfedge_small.gif -text svneol=unset#image/gif diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.pdf similarity index 100% rename from Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.pdf rename to Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.pdf diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.svg similarity index 100% rename from Polyhedron/doc_tex/Polyhedron_ref/fig/euler-facet.svg rename to Polyhedron/doc_tex/Polyhedron_ref/fig/euler_facet.svg diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.pdf similarity index 100% rename from Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.pdf rename to Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.pdf diff --git a/Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg b/Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.svg similarity index 100% rename from Polyhedron/doc_tex/Polyhedron_ref/fig/euler-vertex.svg rename to Polyhedron/doc_tex/Polyhedron_ref/fig/euler_vertex.svg From 66ec3ee6b8e5f3e06a952f5288ececf0977a7159 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Apr 2012 10:30:10 +0000 Subject: [PATCH 091/102] I was wrong: get(std::pair) was already in TR1. Strange that it is not in Boost. --- STL_Extension/include/CGAL/tuple.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index c1ab51bde52..8088806b939 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -71,13 +71,14 @@ struct tuple_element: public boost::tuples::element{}; #endif -#if defined(CGAL_CFG_NO_CPP0X_TUPLE) // if not C++11 tuple +#if defined(CGAL_CFG_NO_CPP0X_TUPLE) && defined(CGAL_CFG_NO_TR1_TUPLE) +// If not TR1 or C++11 tuple, we need to add get(std::pair). //////////////////////////////////////////////////////////// // // // Allow CGAL::cpp0x::get(std::pair), if N==0 or N==1. // // // -// That is already in C++11, but not in TR1 or in Boost // +// That is already in TR1 and C++11, but not in Boost. // // // //////////////////////////////////////////////////////////// template From 4c186e9417da06202cad8d1c77f8ae0ef95c9865 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Apr 2012 10:34:06 +0000 Subject: [PATCH 092/102] Oops: std::tr1::get(std::pair) is in --- STL_Extension/include/CGAL/tuple.h | 1 + 1 file changed, 1 insertion(+) diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index 8088806b939..698df419e55 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -30,6 +30,7 @@ #endif #ifndef CGAL_CFG_NO_TR1_TUPLE # include +# include #endif #include From 2f06819c2eb7e2f6d1b95ba732b4ed87f8b42f58 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 20 Apr 2012 10:52:33 +0000 Subject: [PATCH 093/102] Fix typo --- .../Triangulation_2_ref/Constrained_triangulation_plus_2.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex index dc6a281517c..71555e721e8 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex @@ -102,7 +102,7 @@ is \ccc{Context}.} \ccConstructor{Constrained_triangulation_plus_2(const Constrained_triangulation_plus_2& ct);}{Copy constructor.} -\ccConstructor{Constrained_triangulation_plus_2(std::list& lc, +\ccConstructor{Constrained_triangulation_plus_2(std::list& lc, const Geom_traits& t = Geom_traits())} {Introduces and builds a constrained triangulation from the list of constraints \ccc{lc}.} From 7611a198039ebcd724cd0529e4482b7ddb25f7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 23 Apr 2012 08:13:43 +0000 Subject: [PATCH 094/102] more verbose test --- Number_types/test/Number_types/Root_of_traits.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Number_types/test/Number_types/Root_of_traits.cpp b/Number_types/test/Number_types/Root_of_traits.cpp index 86d1ef54716..a9cb2f5c2a2 100644 --- a/Number_types/test/Number_types/Root_of_traits.cpp +++ b/Number_types/test/Number_types/Root_of_traits.cpp @@ -46,6 +46,7 @@ void test_root_of_traits_for_set(Integer, Rational, FWS){ } int main(){ + std::cout << "Testing with double" << std::endl; CGAL::Test::test_root_of_traits< double , double , double >(); try{// just compile and try to get as far as you can go. @@ -56,6 +57,7 @@ int main(){ #ifdef CGAL_HAS_GMP_ARITHMETIC_KERNEL //TODO: switch to Gmpq { + std::cout << "Testing with GMP" << std::endl; typedef CGAL::GMP_arithmetic_kernel AK; typedef AK::Integer Integer; typedef AK::Rational Rational; @@ -65,6 +67,7 @@ int main(){ #endif #ifdef CGAL_HAS_LEDA_ARITHMETIC_KERNEL { + std::cout << "Testing with LEDA" << std::endl; typedef CGAL::LEDA_arithmetic_kernel AK; typedef AK::Integer Integer; typedef AK::Rational Rational; @@ -74,6 +77,7 @@ int main(){ #endif #ifdef CGAL_HAS_CORE_ARITHMETIC_KERNEL { + std::cout << "Testing with CORE" << std::endl; typedef CGAL::CORE_arithmetic_kernel AK; typedef AK::Integer Integer; typedef AK::Rational Rational; @@ -82,6 +86,7 @@ int main(){ } #endif { + std::cout << "Testing with MP_Float" << std::endl; typedef CGAL::MP_Float_arithmetic_kernel AK; typedef AK::Integer Integer; typedef AK::Rational Rational; From 4fabccd1115341a9c2306280e59e6c9a71052e88 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 13:18:04 +0000 Subject: [PATCH 095/102] updated crontab (automated commit) --- .../infrastructure/cgal.geometryfactory.com/crontab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 175d6bc0540..259c5732ad1 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -11,7 +11,7 @@ # Update testsuite result pages -5,15,25,35,45,55 * * * * cd $HOME/CGAL/collect_and_public_testresults; ./treat_result_collection +#5,15,25,35,45,55 * * * * cd $HOME/CGAL/collect_and_public_testresults; ./treat_result_collection # Create internal release # The script also updates the manual tools. @@ -20,7 +20,7 @@ 0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it # "next" + candidates -0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it +#0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it # - on trunk #0 21 * * Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it @@ -31,10 +31,10 @@ #30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename # Try to launch the test suite, every 10mn, from 21:00 to 22:50 -*/10 21-22 * * * $HOME/CGAL/Scripts/developer_scripts/autotest_cgal_with_cmake +#*/10 21-22 * * * $HOME/CGAL/Scripts/developer_scripts/autotest_cgal_with_cmake # Manual Test suite, at 9:40pm -40 21 * * * cd $HOME/CGAL/releases-and-testsuites-with-cmake/CGAL-I/doc_tex; nice -19 $HOME/bin/cgal_manual -testsuite || true +#40 21 * * * cd $HOME/CGAL/releases-and-testsuites-with-cmake/CGAL-I/doc_tex; nice -19 $HOME/bin/cgal_manual -testsuite || true # Dump the crontab to SVN every hour at minute 18 18 * * * * $HOME/bin/dump_crontab From 5acc79e554415fe4385926e2b0e8699db6dc388d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 16:54:47 +0000 Subject: [PATCH 096/102] Add comments to explain what happens with the use of Default Dt_3 --- Triangulation_3/include/CGAL/Delaunay_triangulation_3.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index 79a8a521374..894fee0afbe 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -47,12 +47,18 @@ namespace CGAL { +// Here is the declaration of a class template with three arguments, one +// having a default value. There is no definition of that class template. template < class Gt, class Tds_ = Default, class Location_policy = Default > class Delaunay_triangulation_3; +// There is a specialization Delaunay_triangulation_3 +// defined in . +// Here is the specialization Delaunay_triangulation_3, with two +// arguments, that is if Location_policy being the default value 'Default'. template < class Gt, class Tds_ > class Delaunay_triangulation_3 : public Triangulation_3 From a8473dfe083418d42bea7eb37474c6e170202988 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 18:03:14 +0000 Subject: [PATCH 097/102] Document the destructor is ugly and useless --- .../Constrained_triangulation_plus_2.tex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex index 71555e721e8..2f8d4476d4b 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_plus_2.tex @@ -119,9 +119,9 @@ $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. is \ccc{Constraint}. } -\ccFunction{void ~ctp();} -{Destructor. All vertices and faces are deleted. -The constraint hierarchy is deleted.} +%\ccFunction{void ~ctp();} +%{Destructor. All vertices and faces are deleted. +%The constraint hierarchy is deleted.} From a4be5cfc47202b7b5ab8cf3fd8cacefa01de9198 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 18:18:04 +0000 Subject: [PATCH 098/102] updated crontab (automated commit) --- .../infrastructure/cgal.geometryfactory.com/crontab | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 259c5732ad1..756c3bdd46d 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -16,11 +16,10 @@ # Create internal release # The script also updates the manual tools. # "next" alone -#0 21 * * Mon,Tue,Wed,Thu,Fri,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it +0 21 * * Fri,Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it -0 21 * * Fri cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next --public --do-it # "next" + candidates -#0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it +0 21 * * Mon,Tue,Wed,Thu,Sun cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it # - on trunk #0 21 * * Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it @@ -28,13 +27,13 @@ #0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --public --do-it # A test that does not work -#30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename +30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename # Try to launch the test suite, every 10mn, from 21:00 to 22:50 -#*/10 21-22 * * * $HOME/CGAL/Scripts/developer_scripts/autotest_cgal_with_cmake +*/10 21-22 * * * $HOME/CGAL/Scripts/developer_scripts/autotest_cgal_with_cmake # Manual Test suite, at 9:40pm -#40 21 * * * cd $HOME/CGAL/releases-and-testsuites-with-cmake/CGAL-I/doc_tex; nice -19 $HOME/bin/cgal_manual -testsuite || true +40 21 * * * cd $HOME/CGAL/releases-and-testsuites-with-cmake/CGAL-I/doc_tex; nice -19 $HOME/bin/cgal_manual -testsuite || true # Dump the crontab to SVN every hour at minute 18 18 * * * * $HOME/bin/dump_crontab From 6c705ab777725d0aa6e5e8b57277003d6ac04e59 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 22:17:15 +0000 Subject: [PATCH 099/102] Fix the test One cannot expect exact intersections computations results when the kernel is not. This patch fixes the test: the equality between the result and the expected result is tested with an epsilon unless the kernel has exact constructions. --- .../triangle_other_intersection_test.cpp | 273 +++++++++--------- 1 file changed, 139 insertions(+), 134 deletions(-) diff --git a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp index 016e772b0b5..6f29a180e18 100644 --- a/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp +++ b/Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp @@ -216,15 +216,20 @@ void random_test() // Precomputed results test // ----------------------------------- template -bool test_aux(const Triangle t, +bool test_aux(bool is_kernel_exact, + const Triangle t, const Query& q, const std::string& name, - const Result& expected) + const Result& expected, + double sq_espilon = 1e-20) { CGAL::Object object = CGAL::intersection(t,q); const Result* pr = CGAL::object_cast(&object); - if ( (NULL != pr) && (expected == *pr) ) + if ( (NULL != pr) && + (is_kernel_exact ? + (expected == *pr) : + CGAL::to_double(CGAL::squared_distance(expected, *pr)) < sq_espilon ) ) { return true; } @@ -243,7 +248,7 @@ bool test_aux(const Triangle t, } template -bool test() +bool test(bool is_kernel_exact = true) { // types typedef typename K::FT FT; @@ -281,10 +286,10 @@ bool test() Segment s32(p3,p2); Segment s31(p3,p1); - bool b = test_aux(t,s12,"t-s12",s12); - b &= test_aux(t,s21,"t-s21",s21); - b &= test_aux(t,s13,"t-s13",s13); - b &= test_aux(t,s23,"t-s23",s23); + bool b = test_aux(is_kernel_exact,t,s12,"t-s12",s12); + b &= test_aux(is_kernel_exact,t,s21,"t-s21",s21); + b &= test_aux(is_kernel_exact,t,s13,"t-s13",s13); + b &= test_aux(is_kernel_exact,t,s23,"t-s23",s23); // Inside points Point p4(FT(0.5), FT(0.5), FT(0.)); @@ -318,30 +323,30 @@ bool test() Segment s78(p7,p8); Segment s87(p8,p7); - b &= test_aux(t,s14,"t-s14",s14); - b &= test_aux(t,s41,"t-s41",s41); - b &= test_aux(t,s24,"t-s24",s24); - b &= test_aux(t,s42,"t-s42",s42); - b &= test_aux(t,s15,"t-s15",s15); - b &= test_aux(t,s25,"t-s25",s25); - b &= test_aux(t,s34,"t-s34",s34); - b &= test_aux(t,s35,"t-s35",s35); - b &= test_aux(t,s36,"t-s36",s36); - b &= test_aux(t,s45,"t-s45",s45); - b &= test_aux(t,s16,"t-s16",s16); - b &= test_aux(t,s26,"t-s26",s26); - b &= test_aux(t,s62,"t-s62",s62); - b &= test_aux(t,s46,"t-s46",s46); - b &= test_aux(t,s65,"t-s65",s65); - b &= test_aux(t,s64,"t-s64",s64); - b &= test_aux(t,s48,"t-s48",s48); - b &= test_aux(t,s56,"t-s56",s56); - b &= test_aux(t,s17,"t-t17",s17); - b &= test_aux(t,s67,"t-t67",s67); - b &= test_aux(t,s68,"t-s68",s68); - b &= test_aux(t,s86,"t-s86",s86); - b &= test_aux(t,s78,"t-t78",s78); - b &= test_aux(t,s87,"t-t87",s87); + b &= test_aux(is_kernel_exact,t,s14,"t-s14",s14); + b &= test_aux(is_kernel_exact,t,s41,"t-s41",s41); + b &= test_aux(is_kernel_exact,t,s24,"t-s24",s24); + b &= test_aux(is_kernel_exact,t,s42,"t-s42",s42); + b &= test_aux(is_kernel_exact,t,s15,"t-s15",s15); + b &= test_aux(is_kernel_exact,t,s25,"t-s25",s25); + b &= test_aux(is_kernel_exact,t,s34,"t-s34",s34); + b &= test_aux(is_kernel_exact,t,s35,"t-s35",s35); + b &= test_aux(is_kernel_exact,t,s36,"t-s36",s36); + b &= test_aux(is_kernel_exact,t,s45,"t-s45",s45); + b &= test_aux(is_kernel_exact,t,s16,"t-s16",s16); + b &= test_aux(is_kernel_exact,t,s26,"t-s26",s26); + b &= test_aux(is_kernel_exact,t,s62,"t-s62",s62); + b &= test_aux(is_kernel_exact,t,s46,"t-s46",s46); + b &= test_aux(is_kernel_exact,t,s65,"t-s65",s65); + b &= test_aux(is_kernel_exact,t,s64,"t-s64",s64); + b &= test_aux(is_kernel_exact,t,s48,"t-s48",s48); + b &= test_aux(is_kernel_exact,t,s56,"t-s56",s56); + b &= test_aux(is_kernel_exact,t,s17,"t-t17",s17); + b &= test_aux(is_kernel_exact,t,s67,"t-t67",s67); + b &= test_aux(is_kernel_exact,t,s68,"t-s68",s68); + b &= test_aux(is_kernel_exact,t,s86,"t-s86",s86); + b &= test_aux(is_kernel_exact,t,s78,"t-t78",s78); + b &= test_aux(is_kernel_exact,t,s87,"t-t87",s87); // Outside points (in triangle plane) Point pA(FT(-0.5), FT(1.), FT(0.5)); @@ -362,17 +367,17 @@ bool test() Segment s1F(p1,pF); Segment sF6(pF,p6); - b &= test_aux(t,sAB,"t-sAB",p2); - b &= test_aux(t,sBC,"t-sBC",s46); - b &= test_aux(t,s2E,"t-s2E",s26); - b &= test_aux(t,sE2,"t-sE2",s62); - b &= test_aux(t,s2A,"t-s2A",p2); - b &= test_aux(t,s6E,"t-s6E",p6); - b &= test_aux(t,sB8,"t-sB8",s48); - b &= test_aux(t,sC8,"t-sC8",s68); - b &= test_aux(t,s8C,"t-s8C",s86); - b &= test_aux(t,s1F,"t-s1F",s13); - b &= test_aux(t,sF6,"t-sF6",s36); + b &= test_aux(is_kernel_exact,t,sAB,"t-sAB",p2); + b &= test_aux(is_kernel_exact,t,sBC,"t-sBC",s46); + b &= test_aux(is_kernel_exact,t,s2E,"t-s2E",s26); + b &= test_aux(is_kernel_exact,t,sE2,"t-sE2",s62); + b &= test_aux(is_kernel_exact,t,s2A,"t-s2A",p2); + b &= test_aux(is_kernel_exact,t,s6E,"t-s6E",p6); + b &= test_aux(is_kernel_exact,t,sB8,"t-sB8",s48); + b &= test_aux(is_kernel_exact,t,sC8,"t-sC8",s68); + b &= test_aux(is_kernel_exact,t,s8C,"t-s8C",s86); + b &= test_aux(is_kernel_exact,t,s1F,"t-s1F",s13); + b &= test_aux(is_kernel_exact,t,sF6,"t-sF6",s36); // Outside triangle plane Point pa(FT(0.), FT(0.), FT(0.)); @@ -386,11 +391,11 @@ bool test() Segment sa8(pa,p8); Segment sb2(pb,p2); - b &= test_aux(t,sab,"t-sab",p1); - b &= test_aux(t,sac,"t-sac",p6); - b &= test_aux(t,sae,"t-sae",p8); - b &= test_aux(t,sa8,"t-sa8",p8); - b &= test_aux(t,sb2,"t-sb2",p2); + b &= test_aux(is_kernel_exact,t,sab,"t-sab",p1); + b &= test_aux(is_kernel_exact,t,sac,"t-sac",p6); + b &= test_aux(is_kernel_exact,t,sae,"t-sae",p8); + b &= test_aux(is_kernel_exact,t,sa8,"t-sa8",p8); + b &= test_aux(is_kernel_exact,t,sb2,"t-sb2",p2); // ----------------------------------- // ray queries @@ -401,10 +406,10 @@ bool test() Ray r13(p1,p3); Ray r23(p2,p3); - b &= test_aux(t,r12,"t-r12",s12); - b &= test_aux(t,r21,"t-r21",s21); - b &= test_aux(t,r13,"t-r13",s13); - b &= test_aux(t,r23,"t-r23",s23); + b &= test_aux(is_kernel_exact,t,r12,"t-r12",s12); + b &= test_aux(is_kernel_exact,t,r21,"t-r21",s21); + b &= test_aux(is_kernel_exact,t,r13,"t-r13",s13); + b &= test_aux(is_kernel_exact,t,r23,"t-r23",s23); // In triangle Point p9_(FT(0.), FT(0.5), FT(0.5)); @@ -432,26 +437,26 @@ bool test() Ray r68(p6,p8); Segment r89_res(p8,p9_); - b &= test_aux(t,r14,"t-r14",s12); - b &= test_aux(t,r41,"t-r41",s41); - b &= test_aux(t,r24,"t-r24",s21); - b &= test_aux(t,r42,"t-r42",s42); - b &= test_aux(t,r15,"t-r15",s15); - b &= test_aux(t,r25,"t-r25",s23); - b &= test_aux(t,r34,"t-r34",s34); - b &= test_aux(t,r35,"t-r35",s32); - b &= test_aux(t,r36,"t-r36",s31); - b &= test_aux(t,r45,"t-r45",s45); - b &= test_aux(t,r16,"t-r16",s13); - b &= test_aux(t,r26,"t-r26",s26); - b &= test_aux(t,r62,"t-r62",s62); - b &= test_aux(t,r46,"t-r46",s46); - b &= test_aux(t,r48,"t-r48",s46); - b &= test_aux(t,r56,"t-r56",s56); - b &= test_aux(t,r47,"t-r47",s45); - b &= test_aux(t,r89,"t-t89",r89_res); - b &= test_aux(t,r68,"t-r68",s64); - b &= test_aux(t,r86,"t-r86",s86); + b &= test_aux(is_kernel_exact,t,r14,"t-r14",s12); + b &= test_aux(is_kernel_exact,t,r41,"t-r41",s41); + b &= test_aux(is_kernel_exact,t,r24,"t-r24",s21); + b &= test_aux(is_kernel_exact,t,r42,"t-r42",s42); + b &= test_aux(is_kernel_exact,t,r15,"t-r15",s15); + b &= test_aux(is_kernel_exact,t,r25,"t-r25",s23); + b &= test_aux(is_kernel_exact,t,r34,"t-r34",s34); + b &= test_aux(is_kernel_exact,t,r35,"t-r35",s32); + b &= test_aux(is_kernel_exact,t,r36,"t-r36",s31); + b &= test_aux(is_kernel_exact,t,r45,"t-r45",s45); + b &= test_aux(is_kernel_exact,t,r16,"t-r16",s13); + b &= test_aux(is_kernel_exact,t,r26,"t-r26",s26); + b &= test_aux(is_kernel_exact,t,r62,"t-r62",s62); + b &= test_aux(is_kernel_exact,t,r46,"t-r46",s46); + b &= test_aux(is_kernel_exact,t,r48,"t-r48",s46); + b &= test_aux(is_kernel_exact,t,r56,"t-r56",s56); + b &= test_aux(is_kernel_exact,t,r47,"t-r47",s45); + b &= test_aux(is_kernel_exact,t,r89,"t-t89",r89_res); + b &= test_aux(is_kernel_exact,t,r68,"t-r68",s64); + b &= test_aux(is_kernel_exact,t,r86,"t-r86",s86); // Outside points (in triangre prane) @@ -467,17 +472,17 @@ bool test() Ray r1F(p1,pF); Ray rF6(pF,p6); - b &= test_aux(t,rAB,"t-rAB",p2); - b &= test_aux(t,rBC,"t-rBC",s46); - b &= test_aux(t,r2E,"t-r2E",s26); - b &= test_aux(t,rE2,"t-rE2",s62); - b &= test_aux(t,r2A,"t-r2A",p2); - b &= test_aux(t,r6E,"t-r6E",p6); - b &= test_aux(t,rB8,"t-rB8",s46); - b &= test_aux(t,rC8,"t-rC8",s64); - b &= test_aux(t,r8C,"t-r8C",s86); - b &= test_aux(t,r1F,"t-r1F",s13); - b &= test_aux(t,rF6,"t-rF6",s31); + b &= test_aux(is_kernel_exact,t,rAB,"t-rAB",p2); + b &= test_aux(is_kernel_exact,t,rBC,"t-rBC",s46); + b &= test_aux(is_kernel_exact,t,r2E,"t-r2E",s26); + b &= test_aux(is_kernel_exact,t,rE2,"t-rE2",s62); + b &= test_aux(is_kernel_exact,t,r2A,"t-r2A",p2); + b &= test_aux(is_kernel_exact,t,r6E,"t-r6E",p6); + b &= test_aux(is_kernel_exact,t,rB8,"t-rB8",s46); + b &= test_aux(is_kernel_exact,t,rC8,"t-rC8",s64); + b &= test_aux(is_kernel_exact,t,r8C,"t-r8C",s86); + b &= test_aux(is_kernel_exact,t,r1F,"t-r1F",s13); + b &= test_aux(is_kernel_exact,t,rF6,"t-rF6",s31); // Outside triangle plane Ray rab(pa,pb); @@ -486,11 +491,11 @@ bool test() Ray ra8(pa,p8); Ray rb2(pb,p2); - b &= test_aux(t,rab,"t-rab",p1); - b &= test_aux(t,rac,"t-rac",p6); - b &= test_aux(t,rae,"t-rae",p8); - b &= test_aux(t,ra8,"t-ra8",p8); - b &= test_aux(t,rb2,"t-rb2",p2); + b &= test_aux(is_kernel_exact,t,rab,"t-rab",p1); + b &= test_aux(is_kernel_exact,t,rac,"t-rac",p6); + b &= test_aux(is_kernel_exact,t,rae,"t-rae",p8); + b &= test_aux(is_kernel_exact,t,ra8,"t-ra8",p8); + b &= test_aux(is_kernel_exact,t,rb2,"t-rb2",p2); // ----------------------------------- // Line queries @@ -501,10 +506,10 @@ bool test() Line l13(p1,p3); Line l23(p2,p3); - b &= test_aux(t,l12,"t-l12",s12); - b &= test_aux(t,l21,"t-l21",s21); - b &= test_aux(t,l13,"t-l13",s13); - b &= test_aux(t,l23,"t-l23",s23); + b &= test_aux(is_kernel_exact,t,l12,"t-l12",s12); + b &= test_aux(is_kernel_exact,t,l21,"t-l21",s21); + b &= test_aux(is_kernel_exact,t,l13,"t-l13",s13); + b &= test_aux(is_kernel_exact,t,l23,"t-l23",s23); // In triangle Line l14(p1,p4); @@ -530,26 +535,26 @@ bool test() Segment l89_res(p1,p9_); - b &= test_aux(t,l14,"t-l14",s12); - b &= test_aux(t,l41,"t-l41",s21); - b &= test_aux(t,l24,"t-l24",s21); - b &= test_aux(t,l42,"t-l42",s12); - b &= test_aux(t,l15,"t-l15",s15); - b &= test_aux(t,l25,"t-l25",s23); - b &= test_aux(t,l34,"t-l34",s34); - b &= test_aux(t,l35,"t-l35",s32); - b &= test_aux(t,l36,"t-l36",s31); - b &= test_aux(t,l45,"t-l45",s45); - b &= test_aux(t,l16,"t-l16",s13); - b &= test_aux(t,l26,"t-l26",s26); - b &= test_aux(t,l62,"t-l62",s62); - b &= test_aux(t,l46,"t-l46",s46); - b &= test_aux(t,l48,"t-l48",s46); - b &= test_aux(t,l56,"t-l56",s56); - b &= test_aux(t,l47,"t-l47",s45); - b &= test_aux(t,l89,"t-t89",l89_res); - b &= test_aux(t,l68,"t-l68",s64); - b &= test_aux(t,l86,"t-l86",s46); + b &= test_aux(is_kernel_exact,t,l14,"t-l14",s12); + b &= test_aux(is_kernel_exact,t,l41,"t-l41",s21); + b &= test_aux(is_kernel_exact,t,l24,"t-l24",s21); + b &= test_aux(is_kernel_exact,t,l42,"t-l42",s12); + b &= test_aux(is_kernel_exact,t,l15,"t-l15",s15); + b &= test_aux(is_kernel_exact,t,l25,"t-l25",s23); + b &= test_aux(is_kernel_exact,t,l34,"t-l34",s34); + b &= test_aux(is_kernel_exact,t,l35,"t-l35",s32); + b &= test_aux(is_kernel_exact,t,l36,"t-l36",s31); + b &= test_aux(is_kernel_exact,t,l45,"t-l45",s45); + b &= test_aux(is_kernel_exact,t,l16,"t-l16",s13); + b &= test_aux(is_kernel_exact,t,l26,"t-l26",s26); + b &= test_aux(is_kernel_exact,t,l62,"t-l62",s62); + b &= test_aux(is_kernel_exact,t,l46,"t-l46",s46); + b &= test_aux(is_kernel_exact,t,l48,"t-l48",s46); + b &= test_aux(is_kernel_exact,t,l56,"t-l56",s56); + b &= test_aux(is_kernel_exact,t,l47,"t-l47",s45); + b &= test_aux(is_kernel_exact,t,l89,"t-t89",l89_res); + b &= test_aux(is_kernel_exact,t,l68,"t-l68",s64); + b &= test_aux(is_kernel_exact,t,l86,"t-l86",s46); // Outside points (in triangle plane) @@ -565,17 +570,17 @@ bool test() Line l1F(p1,pF); Line lF6(pF,p6); - b &= test_aux(t,lAB,"t-lAB",p2); - b &= test_aux(t,lBC,"t-lBC",s46); - b &= test_aux(t,l2E,"t-l2E",s26); - b &= test_aux(t,lE2,"t-lE2",s62); - b &= test_aux(t,l2A,"t-l2A",p2); - b &= test_aux(t,l6E,"t-l6E",s26); - b &= test_aux(t,lB8,"t-lB8",s46); - b &= test_aux(t,lC8,"t-lC8",s64); - b &= test_aux(t,l8C,"t-l8C",s46); - b &= test_aux(t,l1F,"t-l1F",s13); - b &= test_aux(t,lF6,"t-lF6",s31); + b &= test_aux(is_kernel_exact,t,lAB,"t-lAB",p2); + b &= test_aux(is_kernel_exact,t,lBC,"t-lBC",s46); + b &= test_aux(is_kernel_exact,t,l2E,"t-l2E",s26); + b &= test_aux(is_kernel_exact,t,lE2,"t-lE2",s62); + b &= test_aux(is_kernel_exact,t,l2A,"t-l2A",p2); + b &= test_aux(is_kernel_exact,t,l6E,"t-l6E",s26); + b &= test_aux(is_kernel_exact,t,lB8,"t-lB8",s46); + b &= test_aux(is_kernel_exact,t,lC8,"t-lC8",s64); + b &= test_aux(is_kernel_exact,t,l8C,"t-l8C",s46); + b &= test_aux(is_kernel_exact,t,l1F,"t-l1F",s13); + b &= test_aux(is_kernel_exact,t,lF6,"t-lF6",s31); // Outside triangle plane Line lab(pa,pb); @@ -584,11 +589,11 @@ bool test() Line la8(pa,p8); Line lb2(pb,p2); - b &= test_aux(t,lab,"t-lab",p1); - b &= test_aux(t,lac,"t-lac",p6); - b &= test_aux(t,lae,"t-lae",p8); - b &= test_aux(t,la8,"t-la8",p8); - b &= test_aux(t,lb2,"t-lb2",p2); + b &= test_aux(is_kernel_exact,t,lab,"t-lab",p1); + b &= test_aux(is_kernel_exact,t,lac,"t-lac",p6); + b &= test_aux(is_kernel_exact,t,lae,"t-lae",p8); + b &= test_aux(is_kernel_exact,t,la8,"t-la8",p8); + b &= test_aux(is_kernel_exact,t,lb2,"t-lb2",p2); return b; @@ -606,22 +611,22 @@ int main() // ----------------------------------- std::cout << "Test precomputed intersection results" << std::endl; std::cout << "\tTesting with Simple_cartesian..." << std::endl ; - bool b = test(); + bool b = test(false); std::cout << "\tTesting with Simple_cartesian..." << std::endl ; - b &= test(); + b &= test(false); std::cout << "\tTesting with Cartesian..." << std::endl ; - b &= test(); + b &= test(false); std::cout << "\tTesting with Cartesian..." << std::endl ; - b &= test(); + b &= test(false); std::cout << "\tTesting with Exact_predicates_inexact_constructions_kernel..." << std::endl ; - b &= test(); + b &= test(false); std::cout << "\tTesting with Exact_predicates_exact_constructions_kernel..." << std::endl ; - b &= test(); + b &= test(true); //test with a coplanar segment b &= CGAL::intersection( Epec::Segment_3(Epec::Point_3(0.125, 0, -0.125),Epec::Point_3(0.25, 0, -0.125) ), From f2ed350303600e624fe912be8750c7460ce68eb8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 23 Apr 2012 22:18:02 +0000 Subject: [PATCH 100/102] updated crontab (automated commit) --- Maintenance/infrastructure/cgal.geometryfactory.com/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 756c3bdd46d..19e04f3930f 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -27,7 +27,7 @@ #0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --public --do-it # A test that does not work -30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename +#30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename # Try to launch the test suite, every 10mn, from 21:00 to 22:50 */10 21-22 * * * $HOME/CGAL/Scripts/developer_scripts/autotest_cgal_with_cmake From 00b8a700d946e9196683bb3748d4345f44a0536f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 24 Apr 2012 15:46:04 +0000 Subject: [PATCH 101/102] Added the two packages with fixed memory leaks, this also covers the geninfo leak. --- Installation/changes.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Installation/changes.html b/Installation/changes.html index 02f0bc7250d..bfd5047e00c 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -108,6 +108,16 @@ David A. Wheeler's 'SLOCCount'    , restricted to the include/CGAL/
    • Minor bugfix.
    + +

    Surface Mesh Parameterization

    +
      +
    • Fixed a memory leak.
      • +
    + +

    2D Arrangement

    +
      +
    • Fixed several memory leaks.
      • +

    Release 4.0.1

    From f7e9319d4cee6a5216f678b14977d45300fed172 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 24 Apr 2012 16:00:09 +0000 Subject: [PATCH 102/102] Move Philip's additions to the section about 4.0.1 --- Installation/changes.html | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Installation/changes.html b/Installation/changes.html index 0f8b011f391..8b6a253da3f 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -109,17 +109,6 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/
  • Minor bugfix.
    • -

    Surface Mesh Parameterization

    -
      -
    • Fixed a memory leak.
      • -
    - -

    2D Arrangement

    -
      -
    • Fixed several memory leaks.
      • -
    -
    -

    Release 4.0.1

    @@ -160,6 +149,18 @@ since CGAL-4.0:

    2D Boolean Operations on Nef Polygons, 3D Boolean Operations on Nef Polyhedra, Convex Decomposition of Polyhedra, and 3D Minkowski Sum of Polyhedra. + +

    Surface Mesh Parameterization

    +
      +
    • Fixed a memory leak.
      • +
    + +

    2D Arrangement

    +
      +
    • Fixed several memory leaks.
      • +
    +
    +

    Release 4.0