Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller

Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
This commit is contained in:
Laurent Rineau 2016-03-24 11:30:14 +01:00
commit 5b48eedf20
8 changed files with 28 additions and 517 deletions

1
.gitattributes vendored
View File

@ -43,7 +43,6 @@ Scripts/developer_scripts/autotest_cgal text eol=lf
Scripts/developer_scripts/autotest_cgal_with_cmake text eol=lf
Scripts/developer_scripts/cgal_build text eol=lf
Scripts/developer_scripts/cgal_depend text eol=lf
Scripts/developer_scripts/cgal_generate_cmake_script text eol=lf
Scripts/developer_scripts/cgal_git_update_hooks_for_client text eol=lf
Scripts/developer_scripts/cgal_test_with_cmake text eol=lf
Scripts/developer_scripts/cgal2gml text eol=lf

View File

@ -634,8 +634,6 @@ option( CGAL_ENABLE_PRECONFIG "Select to allow to preconfiguration of external l
# this; e.g. in MPFI/RS in Algebraic_kernel_d. For these cases CGAL
# and the example/test must be configured with MPFI (just one is not sufficient)
option( CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT "Select to allow to use all preconfigured external libraries" OFF)
include(CGAL_SetupDependencies)
message("== Detect external libraries (DONE) ==\n")

View File

@ -99,8 +99,6 @@ set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSI
set(CGAL_USE_FILE "${CGAL_MODULES_DIR}/UseCGAL.cmake" )
set(CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT "@CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT@")
if ( CGAL_FIND_REQUIRED )
set( CHECK_CGAL_COMPONENT_MSG_ON_ERROR TRUE )
set( CHECK_CGAL_COMPONENT_ERROR_TYPE FATAL_ERROR )

View File

@ -44,8 +44,6 @@ set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSI
set(CGAL_USE_FILE "${CGAL_MODULES_DIR}/UseCGAL.cmake" )
set(CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT "@CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT@")
if ( CGAL_FIND_REQUIRED )
set( CHECK_CGAL_COMPONENT_MSG_ON_ERROR TRUE )
set( CHECK_CGAL_COMPONENT_ERROR_TYPE FATAL_ERROR )

View File

@ -294,62 +294,44 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
else(WITH_CGAL_${component})
# now we are talking about 3rd party libs
list( FIND CGAL_CONFIGURED_LIBRARIES "CGAL_${component}" POSITION )
if ( "${POSITION}" EQUAL "-1" ) # if component is not a CGAL_<lib>
if ( ${component} STREQUAL "ALL_PRECONFIGURED_LIBS" )
if (CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT)
message( STATUS "External libraries are all used")
foreach ( CGAL_3RD_PARTY_LIB ${CGAL_SUPPORTING_3RD_PARTY_LIBRARIES})
if (${CGAL_3RD_PARTY_LIB}_FOUND)
use_lib( ${CGAL_3RD_PARTY_LIB} ${${CGAL_3RD_PARTY_LIB}_USE_FILE})
endif()
endforeach()
else()
message( SEND_ERROR "Component ALL_PRECONFIGURED_LIBS only allow with CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT=ON")
if (NOT DEFINED CGAL_EXT_LIB_${component}_PREFIX)
set(CGAL_EXT_LIB_${component}_PREFIX ${component})
endif()
else()
set( vlib "${CGAL_EXT_LIB_${component}_PREFIX}" )
list( FIND CGAL_CONFIGURED_LIBRARIES "CGAL_${component}" POSITION )
if ( "${POSITION}" EQUAL "-1" ) # if component is not a CGAL_<lib>
if ( NOT CGAL_IGNORE_PRECONFIGURED_${component} AND ${vlib}_FOUND)
if (NOT DEFINED CGAL_EXT_LIB_${component}_PREFIX)
set(CGAL_EXT_LIB_${component}_PREFIX ${component})
endif()
####message( STATUS "External library ${component} has been preconfigured")
use_lib( ${component} ${${vlib}_USE_FILE})
set( vlib "${CGAL_EXT_LIB_${component}_PREFIX}" )
if ( NOT CGAL_IGNORE_PRECONFIGURED_${component} AND ${vlib}_FOUND)
####message( STATUS "External library ${component} has been preconfigured")
use_lib( ${component} ${${vlib}_USE_FILE})
else()
####message( STATUS "External library ${component} has not been preconfigured")
if (${component} STREQUAL "ImageIO")
find_package( OpenGL )
find_package( ZLIB )
endif()
if (${component} STREQUAL "Qt5")
set(CGAL_${component}_FOUND TRUE)
find_package( OpenGL )
find_package (Qt5 COMPONENTS OpenGL Gui Core Script ScriptTools)
endif()
####message( STATUS "External library ${vlib} after find")
if (${vlib}_FOUND)
####message( STATUS "External library ${vlib} about to be used")
use_lib( ${component} ${${vlib}_USE_FILE})
endif()
endif()
else()
if (NOT WITH_CGAL_${component})
message(STATUS "NOTICE: The CGAL_${component} library seems to be required but is not build. Thus, it is expected that some executables will not be compiled.")
####message( STATUS "External library ${component} has not been preconfigured")
if (${component} STREQUAL "ImageIO")
find_package( OpenGL )
find_package( ZLIB )
endif()
if (${component} STREQUAL "Qt5")
set(CGAL_${component}_FOUND TRUE)
find_package( OpenGL )
find_package (Qt5 COMPONENTS OpenGL Gui Core Script ScriptTools)
endif()
####message( STATUS "External library ${vlib} after find")
if (${vlib}_FOUND)
####message( STATUS "External library ${vlib} about to be used")
use_lib( ${component} ${${vlib}_USE_FILE})
endif()
endif()
else()
if (NOT WITH_CGAL_${component})
message(STATUS "NOTICE: The CGAL_${component} library seems to be required but is not build. Thus, it is expected that some executables will not be compiled.")
endif()
endif()

View File

@ -1,37 +0,0 @@
#!/bin/bash
# Copyright (c) 2012
# 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; 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: svn+ssh://fcacciola@scm.gforge.inria.fr/svn/cgal/trunk/Scripts/scripts/cgal_create_makefile $
# $Id: cgal_create_makefile 36976 2007-03-09 22:53:24Z reichel $
#
# Author(s) : Eric Berberich <eric@mpi-inf.mpg.de>
# TODO usage
# -s source
# -c cgalcomponent
# -b boost component
# EBEB: For some reason, using "$@" only pushes the first word to cmake
cmake -DOPTIONS:STRING="$1 $2 $3 $4 $5 $6" -P cgal_generate_cmake_script.cmake
echo "------------------------ OUTPUT -------------------------"
cat CMakeLists.txt

View File

@ -1,417 +0,0 @@
# Copyright (c) 2012
# 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; 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: svn+ssh://fcacciola@scm.gforge.inria.fr/svn/cgal/trunk/Scripts/scripts/cgal_create_makefile $
# $Id: cgal_create_makefile 36976 2007-03-09 22:53:24Z reichel $
#
# Author(s) : Eric Berberich <eric@mpi-inf.mpg.de>
cmake_minimum_required(VERSION 2.6.2)
message(STATUS "Create CMakeLists.txt")
# message(STATUS "Repeat command line options: ${OPTIONS}")
set(PROJECT CGAL) #`basename $PWD` # TODO set value based on dir/source dir
set(SINGLE_SOURCE "Polygon_2")
list(INSERT CGAL_COMPONENTS 0 Qt4 CoRe gmP MPFR Rs rs3 MPFI) # TODO default value
set(WITH_QT4 FALSE)
set(WITH_ALL_PRECONFIGURED_LIBS FALSE)
list(INSERT BOOST_COMPONENTS 0 thread) # TODO default value
set(WITH_TESTING FALSE)
### Delete file if it exists
if (EXISTS CMakeLists.txt)
file(RENAME CMakeLists.txt CMakeLists.bak)
endif()
### Parse options
# TODO parsing, i.e.
#-s <source>
#-c <list:of:components>/-p
#-b <list:of:components>
#-t # for testing?
#-d directory for sources
### Start to write CMakeLists.txt
file(APPEND CMakeLists.txt "# Created by the script cgal_generate_cmake_script\n" )
file(APPEND CMakeLists.txt "# This is the CMake script for compiling a set of CGAL applications.\n\n" )
if ( "${SINGLE_SOURCE}" STREQUAL "" )
file(APPEND CMakeLists.txt "project(${PROJECT})\n\n")
else()
file(APPEND CMakeLists.txt "project(${SINGLE_SOURCE})\n\n")
endif()
file(APPEND CMakeLists.txt
"cmake_minimum_required(VERSION 2.6.2)
if(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}\" VERSION_GREATER 2.6)
if(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}.\${CMAKE_PATCH_VERSION}\" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components
")
if (WITH_TESTING AND "${SINGLE_SOURCE}" STREQUAL "")
file(APPEND CMakeLists.txt "enable_testing()\n\n")
endif()
foreach( component ${CGAL_COMPONENTS})
# ensure capitalization
# template:
#string(REGEX REPLACE "()" "" rewrote_component ${component})
#set(component ${rewrote_component})
# CGAL: Core, Qt4, PDB, ImageIO
string(REGEX REPLACE "([c|C][o|O][r|R][e|E])" "Core" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([i|I][m|M][a|A][g|G][e|E][i|I][o|O])" "ImageIO" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([q|Q][t|T]4)" "Qt4" rewrote_component ${component})
set(component ${rewrote_component})
# external libs
string(REGEX REPLACE "([g|G][m|M][p|P])" "GMP" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([g|G][m|M][p|P][x|X][x|X])" "GMPXX" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([m|M][p|P][f|F][r|R])" "MPFR" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([l|L][e|E][d|D][a|A])" "LEDA" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([m|M][p|P][f|F][i|I])" "MPFI" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([r|R][s|S]$)" "RS" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([r|R][s|S]3)" "RS3" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([o|O][p|P][e|E][n|N][n|N][l|L])" "OpenNL" rewrote_component ${component})
set(component ${rewrote_component})
set(component ${rewrote_component})
string(REGEX REPLACE "([b|B][l|L][a|A][s|S])" "BLAS" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([l|L][a|A][p|P][a|A][c|C][k|K])" "LAPACK" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([q|Q][g|G][l|L][v|V][i|I][e|E][w|W][e|E][r|R])" "QGLViewer" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([z|Z][l|L][i|I][b|B])" "zlib" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([e|E][s|S][b|B][t|T][l|L])" "ESBTL" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([n|N][t|T][l|L])" "NTL" rewrote_component ${component})
set(component ${rewrote_component})
string(REGEX REPLACE "([o|O][p|P][e|E][n|N][g|G][l|L])" "OpenGL" rewrote_component ${component})
set(component ${rewrote_component})
# TODO Other libs?
#F2C?
#IPE?
#MKL?
list(APPEND CGAL_REWROTE_COMPONENTS ${component})
# detect qt4
if ( ${component} STREQUAL "Qt4" )
set(WITH_QT4 TRUE)
endif()
endforeach()
set(CGAL_COMPONENTS ${CGAL_REWROTE_COMPONENTS})
if ( WITH_ALL_PRECONFIGURED_LIBS )
list(APPEND CGAL_COMPONENTS ALL_PRECONFIGURED_LIBS)
endif()
if ( ${CGAL_COMPONENTS} STREQUAL "")
file(APPEND CMakeLists.txt "find_package( CGAL QUIET )\n\n")
else()
foreach(comp ${CGAL_COMPONENTS})
set(CGAL_SPACED_COMPONENTS "${CGAL_SPACED_COMPONENTS} ${comp}")
endforeach()
file(APPEND CMakeLists.txt "find_package( CGAL QUIET COMPONENTS ${CGAL_SPACED_COMPONENTS} )\n\n")
endif()
file(APPEND CMakeLists.txt
"if ( NOT CGAL_FOUND )
message(STATUS \"This project requires the CGAL library, and will not be compiled.\")
return()
endif()
# include helper file
include( \${CGAL_USE_FILE} )
# Boost and its components
")
### Boost and its components
if ( ${BOOST_COMPONENTS} STREQUAL "")
file(APPEND CMakeLists.txt "find_package( Boost REQUIRED )\n\n")
else()
foreach(comp ${BOOST_COMPONENTS})
set(BOOST_SPACED_COMPONENTS "${BOOST_SPACED_COMPONENTS} ${comp}")
endforeach()
file(APPEND CMakeLists.txt "find_package( Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS} )\n\n")
endif()
file(APPEND CMakeLists.txt
"if ( NOT Boost_FOUND )
message(STATUS \"This project requires the Boost library, and will not be compiled.\")
return()
endif()
")
# TODO add ${SOURCE_DIR}
if ( EXISTS include )
file(APPEND CMakeLists.txt
"# include for local directory
include_directories( BEFORE include )\n\n")
endif()
if ( EXISTS ../../include )
file(APPEND CMakeLists.txt
"# includes for local package
include_directories( BEFORE ../../include )\n\n")
endif()
if ( EXISTS ../include )
file(APPEND CMakeLists.txt
"# includes for local package
include_directories( BEFORE ../include )\n\n")
endif()
if (WITH_QT4)
file(APPEND CMakeLists.txt
"# Qt4
set( QT_USE_QTXML true )
set( QT_USE_QTMAIN true )
set( QT_USE_QTSCRIPT true )
set( QT_USE_QTOPENGL true )
find_package(Qt4)
if ( NOT QT_FOUND )
message(STATUS \"This project requires the Qt4 library, and will not be compiled.\")
return()
endif()
")
endif()
if ( NOT ${BOOST_COMPONENTS} STREQUAL "")
file(APPEND CMakeLists.txt "# Boost linking\n" )
foreach (BOOST_COMPONENT ${BOOST_COMPONENTS})
file(APPEND CMakeLists.txt "add_definitions( \"-DCGAL_USE_BOOST_${BOOST_COMPONENT}\" )")
file(APPEND CMakeLists.txt "list(APPEND CGAL_3RD_PARTY_LIBRARIES \${Boost_${BOOST_COMPONENT}_LIBRARY} )\n")
endforeach()
file(APPEND CMakeLists.txt "\n")
endif()
# All Files or Single Source
if ( "xxx${SINGLE_SOURCE}" STREQUAL "xxx" )
###############
# ALL SOURCES #
###############
file(APPEND CMakeLists.txt
"# Creating entries for all .cpp/.C files with "main" routine
# ##########################################################
")
if (WITH_QT4)
file(APPEND CMakeLists.txt "include( CGAL_CreateSingleSourceCGALProgramQt4 )\n\n")
else()
file(APPEND CMakeLists.txt "include( CGAL_CreateSingleSourceCGALProgram )\n\n")
endif()
if (WITH_QT4)
file(APPEND CMakeLists.txt
"if ( CGAL_Qt4_FOUND AND QT_FOUND )
include( \${QT_USE_FILE} )
include_directories( \${QT_INCLUDE_DIR} )
endif()
")
endif(WITH_QT4)
file(GLOB INPUT_FILES *.C *.cpp) # TODO sort?
foreach( file ${INPUT_FILES} )
file(STRINGS ${file} filecontent)
string(REGEX MATCH "(^main|[^a-zA-Z0-9_]main) *[(]" result ${filecontent})
if (result)
get_filename_component(fname ${file} NAME)
get_filename_component(fname_we ${file} NAME_WE)
if (WITH_QT4)
file(APPEND CMakeLists.txt "create_single_source_cgal_program_qt4( \"${fname}\" )"\n)
else()
file(APPEND CMakeLists.txt "create_single_source_cgal_program( \"${fname}\" )\n")
endif()
if (WITH_TESTING)
if (EXISTS ${fname_we}.cin)
set(CIN " < ${fname_we}.cin")
else()
set(CIN "")
endif()
file(APPEND CMakeLists.txt
"add_test( "${fname_we}" \${CMAKE_CTEST_COMMAND}
--build-and-test "\${CMAKE_CURRENT_SOURCE_DIR}"
"\${CMAKE_CURRENT_BINARY_DIR}"
--build-generator "\${CMAKE_GENERATOR}"
--build-makeprogram "\${CMAKE_MAKE_PROGRAM}"
--build-target ${fname_we}
--build-no-clean
--build-run-dir "\${CMAKE_CURRENT_SOURCE_DIR}"
--test-command sh -c "\${CMAKE_CURRENT_BINARY_DIR}/${fname_we}${CIN}" )
")
endif()
endif()
endforeach()
else()
#################
# SINGLE_SOURCE #
#################
file(APPEND CMakeLists.txt "\n\n# Creating entries for target: ${SINGLE_SOURCE}\n\n")
file(GLOB ALL_SOURCES *.C *.cpp) # TODO sort sources?
if(WITH_QT4)
file(APPEND CMakeLists.txt
"if ( CGAL_Qt4_FOUND AND QT_FOUND )
include( \${QT_USE_FILE} )
include_directories( \${QT_INCLUDE_DIR} )
")
file(APPEND CMakeLists.txt " # UI files (Qt Designer files)\n")
file(GLOB UI_FILES *.ui) # TODO sort?
foreach( file ${UI_FILES} )
file(APPEND CMakeLists.txt " qt4_wrap_ui( DT_UI_FILES ${file} )\n")
endforeach()
file(APPEND CMakeLists.txt "\n")
file(APPEND CMakeLists.txt " # qrc files (resources files, that contain icons, at least)\n")
file(GLOB QRC_FILES *.qrc) # TODO sort?
foreach( file ${QRC_FILES} )
file(APPEND CMakeLists.txt " qt4_add_resources ( DT_RESOURCE_FILES ${file} )\n")
endforeach()
file(APPEND CMakeLists.txt "\n")
set(MOC_FILES "")
file(APPEND CMakeLists.txt " # use the Qt MOC preprocessor on classes that derives from QObject\n")
file(GLOB INPUT_FILES include/*.h *.h) # TODO sort?
foreach( file ${INPUT_FILES} )
file(STRINGS ${file} filecontent)
string(REGEX MATCH "Q_OBJECT" result ${filecontent})
if (result)
get_filename_component(fname ${file} NAME)
get_filename_component(fname_we ${file} NAME_WE)
file(APPEND CMakeLists.txt " qt4_generate_moc( ${file} ${fname_we}.moc )\n")
# ˆ^^^ need file with full path for "include/*.h"
set(MOC_FILES "${fname_we}.moc ${MOC_FILES}")
endif()
endforeach()
file(APPEND CMakeLists.txt "\n")
file(GLOB INPUT_FILES *.cpp) # TODO sort?
foreach( file ${INPUT_FILES} )
file(STRINGS ${file} filecontent)
string(REGEX MATCH "Q_OBJECT" result ${filecontent})
if (result)
get_filename_component(fname ${file} NAME)
get_filename_component(fname_we ${file} NAME_WE)
file(APPEND CMakeLists.txt " qt4_generate_moc( ${fname_we}.cpp ${fname_we}.moc )\n")
set(MOC_FILES "${fname_we}.moc ${MOC_FILES}")
endif()
endforeach()
file(APPEND CMakeLists.txt "\n")
file(APPEND CMakeLists.txt "endif()\n\n")
set( ALL_SOURCES "${ALL_SOURCES} ${MOC_FILES} \${DT_UI_FILES} \${DT_RESOURCE_FILES}")
endif(WITH_QT4)
file(APPEND CMakeLists.txt
"
add_executable( ${SINGLE_SOURCE} ${ALL_SOURCES} )
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${SINGLE_SOURCE} )
# Link the executable to CGAL and third-party libraries
")
set(LIBS "")
if (WITH_QT4)
set(LIBS "\${QT_LIBRARIES}")
endif(WITH_QT4)
file(APPEND CMakeLists.txt "target_link_libraries(${SINGLE_SOURCE} ${LIBS} \${CGAL_LIBRARIES} \${CGAL_3RD_PARTY_LIBRARIES})\n\n# EOF")
endif()
message(STATUS "CMakeLists.txt has been generated.")

View File

@ -119,7 +119,6 @@ if [ -n "$ENABLE_CTEST" ]; then
fi
#---------------------------------------------------------------------------
# echo "CGAL_COMPONENTS: $CGAL_COMPONENTS"
# echo "CGAL_PRECONFIGURED_LIBS: $CGAL_PRECONFIGURED_LIBS"
if [ ! -z "$CGAL_COMPONENTS" ]; then
# ensure capitalization
@ -172,10 +171,6 @@ fi
fi
if [ "$CGAL_PRECONFIGURED_LIBS" = "y" ]; then
CGAL_COMPONENTS=${CGAL_COMPONENTS}" ALL_PRECONFIGURED_LIBS"
fi
echo "find_package( CGAL QUIET COMPONENTS ${CGAL_COMPONENTS//:/ } )"
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
@ -511,7 +506,6 @@ usage()
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','Qt4' ('benchmark', 'symbolic')." >&2
echo " boost_componentX - must be a valid boost component, like 'filesystem', 'program_options'." >&2
echo " -p use all of CGAL's preconfigured libraries" >&2
echo " -o options_file - file with PACKAGE, DIRECTORY, CGAL_COMPONENT, and BOOST_COMPONENT directives" >&2
echo " -v the version" >&2
echo " -h this info screen" >&2
@ -525,8 +519,6 @@ SOURCE=""
CGAL_COMPONENTS_GIVEN=""
CGAL_COMPONENTS=""
CGAL_PRECONFIGURED_LIBS='n'
BOOST_COMPONENTS_GIVEN=""
BOOST_COMPONENTS=""
@ -599,8 +591,6 @@ while getopts s:c:b:o:phvt OPT; do
exit 1
fi
;;
p) CGAL_PRECONFIGURED_LIBS='y'
;;
t) ENABLE_CTEST='y'
;;
h) usage