songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove dependance on CGAL_PDB: merge from the branche created for that purpose 

I do not remove the directory CGAL_PDB as I am allowed to use svn remove.
This commit is contained in:
Sébastien Loriot 2010-06-10 17:26:38 +00:00
parent 93f042b6d7
commit d72337785c
27 changed files with 111 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -1423,6 +1423,7 @@ Installation/cmake/modules/FindBoost.cmake -text
Installation/cmake/modules/FindCGAL.cmake -text Installation/cmake/modules/FindCGAL.cmake -text
Installation/cmake/modules/FindCGAL_CORE.cmake -text Installation/cmake/modules/FindCGAL_CORE.cmake -text
Installation/cmake/modules/FindCORE.cmake -text Installation/cmake/modules/FindCORE.cmake -text
Installation/cmake/modules/FindESBTL.cmake -text
Installation/cmake/modules/FindF2C.cmake -text Installation/cmake/modules/FindF2C.cmake -text
Installation/cmake/modules/FindGMP.cmake -text Installation/cmake/modules/FindGMP.cmake -text
Installation/cmake/modules/FindGMPXX.cmake -text Installation/cmake/modules/FindGMPXX.cmake -text
@ -1441,6 +1442,7 @@ Installation/cmake/modules/FindRS.cmake -text
Installation/cmake/modules/FindTAUCS.cmake -text Installation/cmake/modules/FindTAUCS.cmake -text
Installation/cmake/modules/Qt3Macros-patched.cmake -text Installation/cmake/modules/Qt3Macros-patched.cmake -text
Installation/cmake/modules/UseCGAL.cmake -text Installation/cmake/modules/UseCGAL.cmake -text
Installation/cmake/modules/UseESBTL.cmake -text
Installation/cmake/modules/test_MPFI.cpp -text Installation/cmake/modules/test_MPFI.cpp -text
Installation/config/support/print_BOOST_version.cpp -text Installation/config/support/print_BOOST_version.cpp -text
Installation/config/support/print_GMP_version.cpp -text Installation/config/support/print_GMP_version.cpp -text
@ -1459,7 +1461,6 @@ Installation/test/Installation/CMakeLists.txt -text
Installation/test/Installation/link_to_CGAL.cpp -text Installation/test/Installation/link_to_CGAL.cpp -text
Installation/test/Installation/link_to_CGAL_Core.cpp -text Installation/test/Installation/link_to_CGAL_Core.cpp -text
Installation/test/Installation/link_to_CGAL_ImageIO.cpp -text Installation/test/Installation/link_to_CGAL_ImageIO.cpp -text
Installation/test/Installation/link_to_CGAL_PDB.cpp -text
Installation/test/Installation/link_to_CGAL_Qt3.cpp -text Installation/test/Installation/link_to_CGAL_Qt3.cpp -text
Installation/test/Installation/link_to_CGAL_Qt4.cpp -text Installation/test/Installation/link_to_CGAL_Qt4.cpp -text
Interpolation/demo/Interpolation/CMakeLists.txt -text Interpolation/demo/Interpolation/CMakeLists.txt -text

3
Installation/CHANGES
View File

@ -23,6 +23,9 @@ x.y 2D Mesh Generation
- The execution of the 2D mesh generator is now deterministic (same at - The execution of the 2D mesh generator is now deterministic (same at
each run). each run).
x CGAL_PDB is no longer provided with CGAL. An alternative solution for people
interested in reading PDB files is to use ESBTL (http://esbtl.sourceforge.net/).
----------------------------- Release 3.6.1 -------------------------------- ----------------------------- Release 3.6.1 --------------------------------
CGAL 3.6.1 is a bug-fixes release. The following has been changed CGAL 3.6.1 is a bug-fixes release. The following has been changed
since CGAL-3.6: since CGAL-3.6:

13
Installation/CMakeLists.txt
View File

@ -97,7 +97,7 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" )
# The base name of all CGAL libraries (including "CGAL" itself. That # The base name of all CGAL libraries (including "CGAL" itself. That
# variables can be used by foreach() loops that deal with library variables. # variables can be used by foreach() loops that deal with library variables.
set(ALL_CGAL_LIBRARIES CGAL CGAL_Core CGAL_ImageIO CGAL_PDB CGAL_Qt3 CGAL_Qt4 CACHE INTERNAL "Name of all CGAL libraries.") set(ALL_CGAL_LIBRARIES CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 CACHE INTERNAL "Name of all CGAL libraries.")
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
# #
@ -213,11 +213,6 @@ cache_set(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS "" )
cache_set(CGAL_Qt4_3RD_PARTY_LIBRARIES "" ) cache_set(CGAL_Qt4_3RD_PARTY_LIBRARIES "" )
cache_set(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS "" ) cache_set(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS "" )
cache_set(CGAL_PDB_3RD_PARTY_DEFINITIONS "" )
cache_set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "" )
cache_set(CGAL_PDB_3RD_PARTY_LIBRARIES "" )
cache_set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "" )
include(CGAL_SetupDependencies) include(CGAL_SetupDependencies)
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
@ -366,7 +361,6 @@ add_subdirectory(src)
cache_get(CGAL_LIBRARY) cache_get(CGAL_LIBRARY)
cache_get(CGAL_Core_LIBRARY) cache_get(CGAL_Core_LIBRARY)
cache_get(CGAL_ImageIO_LIBRARY) cache_get(CGAL_ImageIO_LIBRARY)
cache_get(CGAL_PDB_LIBRARY)
cache_get(CGAL_Qt3_LIBRARY) cache_get(CGAL_Qt3_LIBRARY)
cache_get(CGAL_Qt4_LIBRARY) cache_get(CGAL_Qt4_LIBRARY)
@ -395,11 +389,6 @@ cache_get(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS )
cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES ) cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES )
cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS) cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS)
cache_get(CGAL_PDB_3RD_PARTY_DEFINITIONS )
cache_get(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS )
cache_get(CGAL_PDB_3RD_PARTY_LIBRARIES )
cache_get(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS)
hide_variable(EXECUTABLE_OUTPUT_PATH) hide_variable(EXECUTABLE_OUTPUT_PATH)
hide_variable(LIBRARY_OUTPUT_PATH) hide_variable(LIBRARY_OUTPUT_PATH)

6
Installation/LICENSE
View File

@ -7,8 +7,8 @@ from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL.
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -22,8 +22,6 @@ licenses:
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).

7
Installation/cmake/modules/CGALConfig_binary.cmake.in
View File

@ -35,14 +35,12 @@ set(CGAL_LIBRARIES_DIR "@CGAL_LIBRARIES_DIR@" )
set(WITH_CGAL "ON") set(WITH_CGAL "ON")
set(WITH_CGAL_Core "@WITH_CGAL_Core@") set(WITH_CGAL_Core "@WITH_CGAL_Core@")
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@") set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" ) set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" ) set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
set(CGAL_LIBRARY "@CGAL_LIBRARY@") set(CGAL_LIBRARY "@CGAL_LIBRARY@")
set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@") set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@")
set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@") set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@")
set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" )
set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" ) set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" )
set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" ) set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" )
@ -62,11 +60,6 @@ set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIR
set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" )
set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" ) set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" )
set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" )
set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" )
set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" )

7
Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
View File

@ -37,14 +37,12 @@ set(CGAL_LIBRARIES_DIR "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@" )
set(WITH_CGAL "ON") set(WITH_CGAL "ON")
set(WITH_CGAL_Core "@WITH_CGAL_Core@") set(WITH_CGAL_Core "@WITH_CGAL_Core@")
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@") set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" ) set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" ) set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
set(CGAL_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_LIBRARY_NAME@") set(CGAL_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_LIBRARY_NAME@")
set(CGAL_Core_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Core_LIBRARY_NAME@") set(CGAL_Core_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Core_LIBRARY_NAME@")
set(CGAL_ImageIO_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_ImageIO_LIBRARY_NAME@") set(CGAL_ImageIO_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_ImageIO_LIBRARY_NAME@")
set(CGAL_PDB_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_PDB_LIBRARY_NAME@" )
set(CGAL_Qt3_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt3_LIBRARY_NAME@" ) set(CGAL_Qt3_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt3_LIBRARY_NAME@" )
set(CGAL_Qt4_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt4_LIBRARY_NAME@" ) set(CGAL_Qt4_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt4_LIBRARY_NAME@" )
@ -64,11 +62,6 @@ set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIR
set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" )
set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" ) set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" )
set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" )
set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" )
set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" )

7
Installation/cmake/modules/CGALConfig_install.cmake.source.in
View File

@ -35,14 +35,12 @@ set(CGAL_LIBRARIES_DIR "$(CGAL_INSTALL_PREFIX)/@CGAL_INSTALL_LIB_DIR@" )
set(WITH_CGAL "ON") set(WITH_CGAL "ON")
set(WITH_CGAL_Core "@WITH_CGAL_Core@") set(WITH_CGAL_Core "@WITH_CGAL_Core@")
set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@") set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@")
set(WITH_CGAL_PDB "@WITH_CGAL_PDB@" )
set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" ) set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" )
set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" ) set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" )
set(CGAL_LIBRARY "@CGAL_LIBRARY@") set(CGAL_LIBRARY "@CGAL_LIBRARY@")
set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@") set(CGAL_Core_LIBRARY "@CGAL_Core_LIBRARY@")
set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@") set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@")
set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" )
set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" ) set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" )
set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" ) set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" )
@ -62,11 +60,6 @@ set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIR
set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" )
set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" ) set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" )
set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" )
set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" )
set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" )
set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" )
set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" )

28
Installation/cmake/modules/FindESBTL.cmake Normal file
View File

@ -0,0 +1,28 @@
#This modules tries to find ESBTL
# Once done this will define
#
# ESBTL_FOUND - system has ESBTL
# ESBTL_INCLUDE_DIR - ESBTL include directory
#
# Is it already configured?
if (ESBTL_INCLUDE_DIR)
set(ESBTL_FOUND TRUE)
else()
find_path(ESBTL_INCLUDE_DIR
NAMES ESBTL/default.h
PATHS /usr/include
/usr/local/include
)
if(ESBTL_INCLUDE_DIR)
set(ESBTL_FOUND TRUE)
endif()
endif()
if(ESBTL_FOUND)
message(STATUS "Found ESBTL: ${ESBTL_INCLUDE_DIR}")
set(ESBTL_USE_FILE "UseESBTL")
endif()

4
Installation/cmake/modules/UseESBTL.cmake Normal file
View File

@ -0,0 +1,4 @@
# This module setups the compiler for using ESBTL library.
# It assumes that find_package(ESBTL) was already called.
include_directories( ${ESBTL_INCLUDE_DIR} )

3
Installation/doc_tex/Installation/installation.tex
View File

@ -373,7 +373,6 @@ are switched \texttt{ON}.
\texttt{CGAL\_Qt3} & \texttt{WITH\_CGAL\_Qt3} & \ccc{CGAL::Qt_widget} used by Qt3-based demos & Qt3 and OpenGL\\\hline \texttt{CGAL\_Qt3} & \texttt{WITH\_CGAL\_Qt3} & \ccc{CGAL::Qt_widget} used by Qt3-based demos & Qt3 and OpenGL\\\hline
\texttt{CGAL\_Qt4} & \texttt{WITH\_CGAL\_Qt4} & \ccc{QGraphicsView} support for Qt4-based demos & Qt4 and OpenGL\\\hline \texttt{CGAL\_Qt4} & \texttt{WITH\_CGAL\_Qt4} & \ccc{QGraphicsView} support for Qt4-based demos & Qt4 and OpenGL\\\hline
\texttt{CGAL\_ImageIO} & \texttt{WITH\_CGAL\_ImageIO} & Utilities to read and write image files & OpenGL, ZLib, VTK (optional)\\\hline \texttt{CGAL\_ImageIO} & \texttt{WITH\_CGAL\_ImageIO} & Utilities to read and write image files & OpenGL, ZLib, VTK (optional)\\\hline
\texttt{CGAL\_PDB} & \texttt{WITH\_CGAL\_PDB} & \ccc{CGAL::PDB} used to manipulate \texttt{PDB} files & {\em none}\\\hline
\end{tabular} \end{tabular}
\end{center} \end{center}
@ -682,7 +681,6 @@ The following boolean variables indicate which \cgal\ components to configure an
\texttt{WITH\_CGAL\_Qt3} & ON\\\hline \texttt{WITH\_CGAL\_Qt3} & ON\\\hline
\texttt{WITH\_CGAL\_Qt4} & ON\\\hline \texttt{WITH\_CGAL\_Qt4} & ON\\\hline
\texttt{WITH\_CGAL\_ImageIO} & ON\\\hline \texttt{WITH\_CGAL\_ImageIO} & ON\\\hline
\texttt{WITH\_CGAL\_PDB} & ON\\\hline
\end{tabular} \end{tabular}
} }
@ -1130,7 +1128,6 @@ cmake -DWITH_examples=false
-- Configuring CGALimageIO. Set WITH_CGALimageIO to FALSE to unselect it. -- Configuring CGALimageIO. Set WITH_CGALimageIO to FALSE to unselect it.
-- Could NOT find ZLIB -- Could NOT find ZLIB
-- CGAL-ImageIO needs ZLib and OpenGL, cannot be configured. -- CGAL-ImageIO needs ZLib and OpenGL, cannot be configured.
-- Configuring CGALPDB. Set WITH_CGALPDB to FALSE to unselect it.
-- Configuring CGALQt. Set WITH_CGALQt to FALSE to unselect it. -- Configuring CGALQt. Set WITH_CGALQt to FALSE to unselect it.
-- CGAL-Qt3 needs Qt3, cannot be configured. -- CGAL-Qt3 needs Qt3, cannot be configured.
-- Configuring CGALQt4. Set WITH_CGALQt4 to FALSE to unselect it. -- Configuring CGALQt4. Set WITH_CGALQt4 to FALSE to unselect it.

30
Installation/include/CGAL/auto_link/PDB.h
View File

@ -1,30 +0,0 @@
// Copyright (c) 2007 GeometryFactory (France). 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; version 2.1 of the License.
// See the file LICENSE.LGPL distributed with CGAL.
//
// 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) : Fernando Cacciola (fernando.cacciola@geometryfactry.com)
#ifndef CGAL_AUTO_LINK_PDB_H
#define CGAL_AUTO_LINK_PDB_H
#ifndef CGAL_NO_AUTOLINK_PDB
#define CGAL_LIB_NAME CGAL_PDB
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_NO_AUTOLINK_PDB
#endif // CGAL_AUTO_LINK_PDB_H

1
Installation/src/CMakeLists.txt
View File

@ -18,6 +18,5 @@ else(NOT CGAL_NO_CORE)
endif(NOT CGAL_NO_CORE) endif(NOT CGAL_NO_CORE)
configure_component( CGALimageIO ImageIO ) configure_component( CGALimageIO ImageIO )
configure_component( CGALPDB PDB )
configure_component( CGALQt Qt3 ) configure_component( CGALQt Qt3 )
configure_component( CGALQt4 Qt4 ) configure_component( CGALQt4 Qt4 )

4
Installation/test/Installation/CMakeLists.txt
View File

@ -51,10 +51,6 @@ if ( CGAL_FOUND )
create_link_to_program(CGAL_ImageIO) create_link_to_program(CGAL_ImageIO)
endif() endif()
if ( WITH_CGAL_PDB )
create_link_to_program(CGAL_PDB)
endif()
if ( WITH_CGAL_Qt3 ) if ( WITH_CGAL_Qt3 )
create_link_to_program(CGAL_Qt3) create_link_to_program(CGAL_Qt3)
endif() endif()

12
Installation/test/Installation/link_to_CGAL_PDB.cpp
View File

@ -1,12 +0,0 @@
// Use something defined not in headers but in the CGAL library to test that is was indeed properly built and linked to,
#include <CGAL/PDB/PDB.h>
int main()
{
std::ifstream in("");
volatile CGAL::PDB::PDB pdb(in,false);
return 0;
}

34
Maintenance/deb/lenny/debian/copyright
View File

@ -155,8 +155,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -170,8 +170,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -310,34 +308,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; 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 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of 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 the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

1
Maintenance/deb/lenny/debian/libcgal5.shlibs
View File

@ -1,6 +1,5 @@
libCGAL 5 libcgal5 libCGAL 5 libcgal5
libCGAL_Core 5 libcgal5 libCGAL_Core 5 libcgal5
libCGAL_ImageIO 5 libcgal5 libCGAL_ImageIO 5 libcgal5
libCGAL_PDB 5 libcgal5
libCGAL_Qt3 5 libcgal5 libCGAL_Qt3 5 libcgal5
libCGAL_Qt4 5 libcgal5 libCGAL_Qt4 5 libcgal5

34
Maintenance/deb/sid/debian/copyright
View File

@ -155,8 +155,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -170,8 +170,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -310,34 +308,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; 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 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of 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 the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

1
Maintenance/deb/sid/debian/libcgal5.shlibs
View File

@ -1,6 +1,5 @@
libCGAL 5 libcgal5 libCGAL 5 libcgal5
libCGAL_Core 5 libcgal5 libCGAL_Core 5 libcgal5
libCGAL_ImageIO 5 libcgal5 libCGAL_ImageIO 5 libcgal5
libCGAL_PDB 5 libcgal5
libCGAL_Qt3 5 libcgal5 libCGAL_Qt3 5 libcgal5
libCGAL_Qt4 5 libcgal5 libCGAL_Qt4 5 libcgal5

34
Maintenance/deb/squeeze/debian/copyright
View File

@ -155,8 +155,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -170,8 +170,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -310,34 +308,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; 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 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of 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 the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

1
Maintenance/deb/squeeze/debian/libcgal5.shlibs
View File

@ -1,6 +1,5 @@
libCGAL 5 libcgal5 libCGAL 5 libcgal5
libCGAL_Core 5 libcgal5 libCGAL_Core 5 libcgal5
libCGAL_ImageIO 5 libcgal5 libCGAL_ImageIO 5 libcgal5
libCGAL_PDB 5 libcgal5
libCGAL_Qt3 5 libcgal5 libCGAL_Qt3 5 libcgal5
libCGAL_Qt4 5 libcgal5 libCGAL_Qt4 5 libcgal5

2
Scripts/developer_scripts/autotest_cgal
View File

@ -525,7 +525,7 @@ cmake '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\ -DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
VERBOSE=1 \\ VERBOSE=1 \\
../../..; ../../..;
${MAKE_CMD} VERBOSE=ON -k -fMakefile CGAL CGAL_Core CGAL_PDB CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 ; ${MAKE_CMD} VERBOSE=ON -k -fMakefile CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 ;
cd ..; cd ..;
EOF EOF
chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript" chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript"

6
Scripts/developer_scripts/check_licenses
View File

@ -55,11 +55,11 @@ if [ ! -f INSTALL ]; then
fi fi
grep -r -L "^\(//\| \*\|#\) See the file LICENSE\.\(LG\|Q\)PL distributed with CGAL\." * | \ grep -r -L "^\(//\| \*\|#\) See the file LICENSE\.\(LG\|Q\)PL distributed with CGAL\." * | \
grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^include/CGAL/PDB/\|^src/CGALCore/\|^src/CGALimageIO/\|^src/CGALPDB/\|^config/support/\|test/\|^Packages/\|^developer_scripts\|^doc_tex/\|^winutils/" | sort >$PREFIX1 || true grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^src/CGALCore/\|^src/CGALimageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts\|^doc_tex/\|^winutils/" | sort >$PREFIX1 || true
echo Note that files in the following directories are ignored: echo Note that files in the following directories are ignored:
echo include/CGAL/CORE, include/CGAL/OpenNL, include/CGAL/PDB, echo include/CGAL/CORE, include/CGAL/OpenNL,
echo src/CGALCore, src/CGALimageIO, src/CGALPDB, config/support, echo src/CGALCore, src/CGALimageIO, config/support,
echo test, Packages, developer_scripts, doc_tex, winutils echo test, Packages, developer_scripts, doc_tex, winutils
echo echo

2
Scripts/scripts/cgal_create_cmake_script_with_options
View File

@ -626,7 +626,7 @@ usage()
echo "Usage: `basename $0` [-s source] [-c cgal-component1:cgal-component2:...] [-b boost-component1:boost-component2:...] [-p /path/to/package1:/path/to/package2:...] [-d /path/to/directory1:/path/to/directory2:...] [-o options_file='`pwd`/cgal_cmake_options:$HOME/.cgal_cmake_options_rc'] [-v] [-h]" >&2 echo "Usage: `basename $0` [-s source] [-c cgal-component1:cgal-component2:...] [-b boost-component1:boost-component2:...] [-p /path/to/package1:/path/to/package2:...] [-d /path/to/directory1:/path/to/directory2:...] [-o options_file='`pwd`/cgal_cmake_options:$HOME/.cgal_cmake_options_rc'] [-v] [-h]" >&2
echo >&2 echo >&2
echo " -s source If this parameter is given the script will create one single executable for 'source' with all source files; otherwise it creates one executable for each main'ed source." >&2 echo " -s source If this parameter is given the script will create one single executable for 'source' with all source files; otherwise it creates one executable for each main'ed source." >&2
echo " cgal_componentX - must be a valid cgal component, examples are 'Core','imageIO','PDB','Qt3','Qt4' ('benchmark')." >&2 echo " cgal_componentX - must be a valid cgal component, examples are 'Core','imageIO','Qt3','Qt4' ('benchmark')." >&2
echo " boost_componentX - must be a valid boost component, like 'filesystem', 'program_options'." >&2 echo " boost_componentX - must be a valid boost component, like 'filesystem', 'program_options'." >&2
echo " options_file - file with PACKAGE, DIRECTORY, CGAL_COMPONENT, and BOOST_COMPONENT directives" >&2 echo " options_file - file with PACKAGE, DIRECTORY, CGAL_COMPONENT, and BOOST_COMPONENT directives" >&2
echo " -v the version" >&2 echo " -v the version" >&2

23
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
View File

@ -11,26 +11,33 @@ if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW ) cmake_policy( SET CMP0003 NEW )
endif() endif()
find_package(CGAL QUIET COMPONENTS PDB ) find_package(CGAL)
include( ${CGAL_USE_FILE} ) find_package(ESBTL)
if(CGAL_PDB_FOUND)
if (CGAL_FOUND)
include( ${CGAL_USE_FILE} )
include( CGAL_CreateSingleSourceCGALProgram ) include( CGAL_CreateSingleSourceCGALProgram )
include_directories (BEFORE include) include_directories (BEFORE include)
create_single_source_cgal_program( "NGHK_skin_surface_simple.cpp" ) create_single_source_cgal_program( "NGHK_skin_surface_simple.cpp" )
create_single_source_cgal_program( "NGHK_skin_surface_subdiv.cpp" ) create_single_source_cgal_program( "NGHK_skin_surface_subdiv.cpp" )
create_single_source_cgal_program( "skin_surface_pdb_reader.cpp" )
create_single_source_cgal_program( "skin_surface_simple.cpp" ) create_single_source_cgal_program( "skin_surface_simple.cpp" )
create_single_source_cgal_program( "skin_surface_subdiv.cpp" ) create_single_source_cgal_program( "skin_surface_subdiv.cpp" )
create_single_source_cgal_program( "skin_surface_subdiv_with_normals.cpp" ) create_single_source_cgal_program( "skin_surface_subdiv_with_normals.cpp" )
create_single_source_cgal_program( "union_of_balls_simple.cpp" ) create_single_source_cgal_program( "union_of_balls_simple.cpp" )
create_single_source_cgal_program( "union_of_balls_subdiv.cpp" ) create_single_source_cgal_program( "union_of_balls_subdiv.cpp" )
if(ESBTL_FOUND)
include( ${ESBTL_USE_FILE} )
create_single_source_cgal_program( "skin_surface_pdb_reader.cpp" )
else(ESBTL_FOUND)
message(STATUS "NOTICE: skin_surface_pdb_reader.cpp requires ESBTL library, and will not be compiled.")
endif(ESBTL_FOUND)
else(CGAL_PDB_FOUND) else(CGAL_FOUND)
message(STATUS "NOTICE: This directory requires CGAL PDB library, and will not be compiled.") message(STATUS "NOTICE: This directory requires CGAL library, and will not be compiled.")
endif(CGAL_PDB_FOUND) endif(CGAL_FOUND)

64
Skin_surface_3/examples/Skin_surface_3/include/extract_balls_from_pdb.h
View File

@ -1,45 +1,39 @@
// AUTHOR: Daniel Russel drussel@graphics.stanford.edu
// See http://graphics.stanford.edu/~drussel/pdb for documentation.
//
// Feel free to contact me (Daniel, drussel@graphics.stanford.edu)
// if you have any suggestions or patches. Thanks.
#ifndef EXTRACT_BALLS_FROM_PDB_H #ifndef EXTRACT_BALLS_FROM_PDB_H
#define EXTRACT_BALLS_FROM_PDB_H #define EXTRACT_BALLS_FROM_PDB_H
#include <CGAL/PDB/PDB.h> #include <ESBTL/atom_classifier.h>
#include <CGAL/PDB/range.h> #include <ESBTL/weighted_atom_iterator.h>
#include <fstream>
template <class Range, class OIt>
void copy(Range r, OIt out) {
std::copy(r.begin(), r.end(), out);
}
template <class Traits, class OutputIterator> template <class K,class System, class OutputIterator>
void extract_balls_from_pdb(const char *filename, void extract_balls_from_pdb(const char *filename,
Traits const &t, std::vector<System>& systems,
OutputIterator weighted_points) OutputIterator weighted_points)
{ {
std::ifstream in(filename);
if (!in) {
std::cerr << "Error opening input file " << filename << std::endl;
}
using namespace CGAL::PDB;
PDB pdb(in);
Model m=pdb.models().begin()->model();
Chain c=m.chains().begin()->chain();
// get all weighted_points
::copy typedef ESBTL::Generic_classifier<ESBTL::Radius_of_atom<double,typename System::Atom> > T_Atom_classifier;
(make_weighted_point_range(make_atom_range(m.atoms()), t), typedef ESBTL::Accept_none_occupancy_policy<ESBTL::PDB::Line_format<> > Accept_none_occupancy_policy;
weighted_points); typedef ESBTL::Weighted_atom_iterator<typename System::Model,
CGAL::Weighted_point<typename K::Point_3,double>,
ESBTL::Weight_of_atoms<T_Atom_classifier> > Weighted_atom_iterator;
ESBTL::PDB_line_selector sel;
ESBTL::All_atom_system_builder<System> builder(systems,sel.max_nb_systems());
T_Atom_classifier atom_classifier;
ESBTL::read_a_pdb_file(filename,sel,builder,Accept_none_occupancy_policy());
if ( systems.empty() || systems[0].has_no_model() ){
std::cerr << "No atoms found" << std::endl;
exit(EXIT_FAILURE);
}
const typename System::Model& model=* systems[0].models_begin();
std::copy(Weighted_atom_iterator(model.atoms_begin(),&atom_classifier),
Weighted_atom_iterator(model.atoms_end(),&atom_classifier),
weighted_points);
} }
#endif // EXTRACT_BALLS_FROM_PDB_H #endif // EXTRACT_BALLS_FROM_PDB_H

22
Skin_surface_3/examples/Skin_surface_3/skin_surface_pdb_reader.cpp
View File

@ -5,7 +5,11 @@
#include <CGAL/Skin_surface_polyhedral_items_3.h> #include <CGAL/Skin_surface_polyhedral_items_3.h>
#include <list> #include <list>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; #include <ESBTL/CGAL/EPIC_kernel_with_atom.h>
#include <ESBTL/default.h>
typedef ESBTL::CGAL::EPIC_kernel_with_atom K;
typedef ESBTL::CGAL::Default_system System;
typedef CGAL::Skin_surface_traits_3<K> Traits; typedef CGAL::Skin_surface_traits_3<K> Traits;
typedef CGAL::Skin_surface_3<Traits> Skin_surface_3; typedef CGAL::Skin_surface_3<Traits> Skin_surface_3;
typedef Skin_surface_3::FT FT; typedef Skin_surface_3::FT FT;
@ -13,11 +17,10 @@ typedef Skin_surface_3::Weighted_point Weighted_point;
typedef Weighted_point::Point Bare_point; typedef Weighted_point::Point Bare_point;
typedef CGAL::Polyhedron_3<K> Polyhedron; typedef CGAL::Polyhedron_3<K> Polyhedron;
#include <extract_balls_from_pdb.h>
#include <list> #include <list>
#include <fstream> #include <fstream>
#include "skin_surface_writer.h" #include "skin_surface_writer.h"
#include "include/extract_balls_from_pdb.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -27,12 +30,19 @@ int main(int argc, char *argv[]) {
} else { } else {
filename = "data/1t7i.pdb"; filename = "data/1t7i.pdb";
} }
std::list<Weighted_point> l; std::list<Weighted_point> l;
double shrinkfactor = 0.5; double shrinkfactor = 0.5;
//Container for molecular system
std::vector<System> systems;
// Retrieve input balls: // Retrieve input balls:
extract_balls_from_pdb(filename, Traits(), std::back_inserter(l)); extract_balls_from_pdb<K>(filename,systems,std::back_inserter(l));
// Construct skin surface: // Construct skin surface:
Skin_surface_3 skin_surface(l.begin(), l.end(), shrinkfactor); Skin_surface_3 skin_surface(l.begin(), l.end(), shrinkfactor);

1
Testsuite/test/collect_cgal_testresults_from_cmake
View File

@ -262,7 +262,6 @@ parse_flags_and_third_party_choices
parse_lib_building_results "libCGALCore" "CGAL_Core" parse_lib_building_results "libCGALCore" "CGAL_Core"
parse_lib_building_results "libCGAL" "CGAL" parse_lib_building_results "libCGAL" "CGAL"
parse_lib_building_results "libCGALimageIO" "CGAL_ImageIO" parse_lib_building_results "libCGALimageIO" "CGAL_ImageIO"
parse_lib_building_results "libCGALPDB" "CGAL_PDB"
parse_lib_building_results "libCGALQt" "CGAL_Qt3" parse_lib_building_results "libCGALQt" "CGAL_Qt3"
parse_lib_building_results "libCGALQt4" "CGAL_Qt4" parse_lib_building_results "libCGALQt4" "CGAL_Qt4"