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

Remove definitions of CGAL_3RD_PARTY_* variables in user-side dependency setup scripts

This commit is contained in:
Fernando Cacciola 2008-10-30 15:43:44 +00:00
parent 7520be8ebf
commit f44cc724b2
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Installation/cmake/modules/CGAL_SetupBLAS.cmake
View File

@ -13,14 +13,11 @@ if ( NOT BLAS_FOUND )
endif()
message( STATUS "BLAS link flags: ${BLAS_LINKER_FLAGS}" )
#get_dependency_version(BLAS)
add_definitions( ${BLAS_DEFINITIONS} "-DCGAL_USE_BLAS" )
set( CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${BLAS_DEFINITIONS} )
link_directories( ${BLAS_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES_DIRS ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ${BLAS_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${BLAS_LIBRARIES} ${BLAS_LINKER_FLAGS} )
link_libraries( ${BLAS_LIBRARIES} ${BLAS_LINKER_FLAGS} )
endif()

7
Installation/cmake/modules/CGAL_SetupLAPACK.cmake
View File

@ -16,14 +16,11 @@ if ( NOT LAPACK_FOUND )
endif()
message( STATUS "LAPACK link flags: ${LAPACK_LINKER_FLAGS}" )
#get_dependency_version(LAPACK)
add_definitions( ${LAPACK_DEFINITIONS} "-DCGAL_USE_LAPACK" )
set( CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${LAPACK_DEFINITIONS} )
link_directories( ${LAPACK_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES_DIRS ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ${LAPACK_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS} )
link_libraries( ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS} )
endif()

8
Installation/cmake/modules/CGAL_SetupLEDA.cmake
View File

@ -12,11 +12,11 @@ if ( NOT LEDA_FOUND )
include(CGAL_Macros)
cache_set(CGAL_3RD_PARTY_INCLUDE_DIRS ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${LEDA_INCLUDE_DIR} "" )
cache_set(CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${LEDA_LIBRARIES} "" )
cache_set(CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${LEDA_DEFINITIONS} "" )
include_directories( ${LEDA_INCLUDE_DIR} )
#get_dependency_version(LEDA)
link_libraries( ${LEDA_LIBRARIES} )
add_definitions ( ${LEDA_DEFINITIONS} )
endif()

6
Installation/cmake/modules/CGAL_SetupTAUCS.cmake
View File

@ -17,16 +17,12 @@ if ( NOT TAUCS_FOUND )
message( STATUS "TAUCS libraries: ${TAUCS_LIBRARIES}" )
endif()
#get_dependency_version(TAUCS)
include_directories ( ${TAUCS_INCLUDE_DIR} )
add_definitions( ${TAUCS_DEFINITIONS} "-DCGAL_USE_TAUCS" )
set( CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${TAUCS_DEFINITIONS} )
link_directories( ${TAUCS_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES_DIRS ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ${TAUCS_LIBRARIES_DIR} )
set( CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${TAUCS_LIBRARIES} )
lini_libraries ( ${TAUCS_LIBRARIES} )
endif()