From f44cc724b2eb56e257c908f3fb20005594f9954a Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Thu, 30 Oct 2008 15:43:44 +0000 Subject: [PATCH] Remove definitions of CGAL_3RD_PARTY_* variables in user-side dependency setup scripts --- Installation/cmake/modules/CGAL_SetupBLAS.cmake | 7 ++----- Installation/cmake/modules/CGAL_SetupLAPACK.cmake | 7 ++----- Installation/cmake/modules/CGAL_SetupLEDA.cmake | 8 ++++---- Installation/cmake/modules/CGAL_SetupTAUCS.cmake | 6 +----- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Installation/cmake/modules/CGAL_SetupBLAS.cmake b/Installation/cmake/modules/CGAL_SetupBLAS.cmake index 05e56470c72..dacdf8273a8 100644 --- a/Installation/cmake/modules/CGAL_SetupBLAS.cmake +++ b/Installation/cmake/modules/CGAL_SetupBLAS.cmake @@ -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() diff --git a/Installation/cmake/modules/CGAL_SetupLAPACK.cmake b/Installation/cmake/modules/CGAL_SetupLAPACK.cmake index bb56ad4dc3a..b4bf6448749 100644 --- a/Installation/cmake/modules/CGAL_SetupLAPACK.cmake +++ b/Installation/cmake/modules/CGAL_SetupLAPACK.cmake @@ -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() diff --git a/Installation/cmake/modules/CGAL_SetupLEDA.cmake b/Installation/cmake/modules/CGAL_SetupLEDA.cmake index 632041db8dd..f85eada4dc8 100644 --- a/Installation/cmake/modules/CGAL_SetupLEDA.cmake +++ b/Installation/cmake/modules/CGAL_SetupLEDA.cmake @@ -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() diff --git a/Installation/cmake/modules/CGAL_SetupTAUCS.cmake b/Installation/cmake/modules/CGAL_SetupTAUCS.cmake index 12f4b7be33e..395126be146 100644 --- a/Installation/cmake/modules/CGAL_SetupTAUCS.cmake +++ b/Installation/cmake/modules/CGAL_SetupTAUCS.cmake @@ -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()