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

Allow print_XYZ_version programs to have 3rd-party dependencies (such as MPFR depending on GMP)

This commit is contained in:
Fernando Cacciola 2008-09-08 17:26:36 +00:00
parent d4affa0e84
commit 80d8140240
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,9 +70,9 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
${LIB}_COMPILE_RES ${LIB}_COMPILE_RES
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/config/support/print_${LIB}_version.cpp ${CMAKE_SOURCE_DIR}/config/support/print_${LIB}_version.cpp
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${${PKG}_INCLUDE_DIR} CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${${PKG}_DEPENDENCY_INCLUDE_DIR};${${PKG}_INCLUDE_DIR}"
-DLINK_LIBRARIES:STRING=${${PKG}_LIBRARIES} "-DLINK_LIBRARIES:STRING=${${PKG}_DEPENDENCY_LIBRARIES};${${PKG}_LIBRARIES}"
-DLINK_DIRECTORIES:STRING=${${PKG}_LIBRARY_DIR} "-DLINK_DIRECTORIES:STRING=${${PKG}_DEPENDENCY_LIBRARY_DIR};${${PKG}_LIBRARY_DIR}"
OUTPUT_VARIABLE ${LIB}_OUTPUT OUTPUT_VARIABLE ${LIB}_OUTPUT
) )

1
Installation/cmake/modules/FindCGALDependencies.cmake
View File

@ -40,6 +40,7 @@ if ( GMP_FOUND )
endif() endif()
if ( MPFR_FOUND ) if ( MPFR_FOUND )
set( MPFR_DEPENDENCY_INCLUDE_DIR ${GMP_INCLUDE_DIR} )
get_dependency_version(MPFR) get_dependency_version(MPFR)
message( STATUS "MPFR include: ${MPFR_INCLUDE_DIR}" ) message( STATUS "MPFR include: ${MPFR_INCLUDE_DIR}" )
message( STATUS "MPFR libraries: ${MPFR_LIBRARIES}" ) message( STATUS "MPFR libraries: ${MPFR_LIBRARIES}" )