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

the mandatory libs need an particular order, and we simplify with a macro

This commit is contained in:
Eric Berberich 2012-06-29 09:24:19 +00:00
parent 656b09f242
commit b5a4e941fd
7 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
View File

@ -13,7 +13,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif()
# CGAL and its components
find_package( CGAL QUIET COMPONENTS Core GMP MPFR MPFI RS3 )
find_package( CGAL QUIET COMPONENTS Core MPFI RS3)
if ( NOT CGAL_FOUND )

6
Core/src/CGALCore/CMakeLists.txt
View File

@ -1,10 +1,6 @@
message(STATUS "Configure libCGALCore")
use_lib( GMP )
use_lib( MPFR )
if (GMPXX_FOUND)
use_lib( GMPXX )
endif()
use_mandatory_libs()
include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})

6
GraphicsView/src/CGALQt4/CMakeLists.txt
View File

@ -57,11 +57,7 @@ if( QT4_FOUND )
# message(STATUS "Additional input files: ${additional_files}")
use_lib( GMP )
use_lib( MPFR )
if (GMPXX_FOUND)
use_lib( GMPXX )
endif()
use_mandatory_libs()
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )

15
Installation/cmake/modules/CGAL_Macros.cmake
View File

@ -344,6 +344,21 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
endmacro()
macro( use_mandatory_libs )
# Comment: This is subject to be changed in the future
# - either more specific (giving precise include_dir- and link-order)
# - or even less specific if order becomes less relevant
# Eric Berberich 2012/06/29
use_component( MPFR )
use_component( GMP )
if (GMPXX_FOUND)
use_component( GMPXX )
endif()
endmacro()
function( cgal_setup_module_path )
# Avoid to modify the modules path twice

10
Installation/cmake/modules/UseCGAL.cmake
View File

@ -22,18 +22,10 @@ if(NOT USE_CGAL_FILE_INCLUDED)
set( CGAL_LIBRARIES )
foreach ( component ${CGAL_REQUESTED_COMPONENTS} )
use_component( ${component} )
endforeach()
# these two and a half are mandatory
use_component( GMP )
use_component( MPFR )
if (GMPXX_FOUND)
use_component( GMPXX )
endif()
use_mandatory_libs()
include_directories( "${CMAKE_CURRENT_BINARY_DIR}" )

6
Installation/src/CGAL/CMakeLists.txt
View File

@ -1,10 +1,6 @@
message(STATUS "Configure libCGAL")
use_lib( GMP )
use_lib( MPFR)
if (GMPXX_FOUND)
use_lib( GMPXX )
endif()
use_mandatory_libs()
include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})

6
Qt_widget/src/CGALQt3/CMakeLists.txt
View File

@ -38,11 +38,7 @@ if( QT3_FOUND )
include(Qt3Macros-patched)
use_lib( GMP )
use_lib( MPFR )
if (GMPXX_FOUND)
use_lib( GMPXX )
endif()
use_mandatory_libs()
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} )