From 80d81402401a288b758fec4e1072c84f8723f19b Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Mon, 8 Sep 2008 17:26:36 +0000 Subject: [PATCH] Allow print_XYZ_version programs to have 3rd-party dependencies (such as MPFR depending on GMP) --- Installation/cmake/modules/CGALcommon.cmake | 6 +++--- Installation/cmake/modules/FindCGALDependencies.cmake | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Installation/cmake/modules/CGALcommon.cmake b/Installation/cmake/modules/CGALcommon.cmake index 96a7b4f69b3..9e54c5dba32 100644 --- a/Installation/cmake/modules/CGALcommon.cmake +++ b/Installation/cmake/modules/CGALcommon.cmake @@ -70,9 +70,9 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) ${LIB}_COMPILE_RES ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/config/support/print_${LIB}_version.cpp - CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${${PKG}_INCLUDE_DIR} - -DLINK_LIBRARIES:STRING=${${PKG}_LIBRARIES} - -DLINK_DIRECTORIES:STRING=${${PKG}_LIBRARY_DIR} + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${${PKG}_DEPENDENCY_INCLUDE_DIR};${${PKG}_INCLUDE_DIR}" + "-DLINK_LIBRARIES:STRING=${${PKG}_DEPENDENCY_LIBRARIES};${${PKG}_LIBRARIES}" + "-DLINK_DIRECTORIES:STRING=${${PKG}_DEPENDENCY_LIBRARY_DIR};${${PKG}_LIBRARY_DIR}" OUTPUT_VARIABLE ${LIB}_OUTPUT ) diff --git a/Installation/cmake/modules/FindCGALDependencies.cmake b/Installation/cmake/modules/FindCGALDependencies.cmake index 76e7dcfb868..bf6edbc9ec2 100644 --- a/Installation/cmake/modules/FindCGALDependencies.cmake +++ b/Installation/cmake/modules/FindCGALDependencies.cmake @@ -40,6 +40,7 @@ if ( GMP_FOUND ) endif() if ( MPFR_FOUND ) + set( MPFR_DEPENDENCY_INCLUDE_DIR ${GMP_INCLUDE_DIR} ) get_dependency_version(MPFR) message( STATUS "MPFR include: ${MPFR_INCLUDE_DIR}" ) message( STATUS "MPFR libraries: ${MPFR_LIBRARIES}" )