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

Merge remote-tracking branch 'origin/Installation-link_libraries_deprecated-eric'

This commit is contained in:
Laurent Rineau 2013-01-14 14:50:59 +01:00
parent ae50be5697 d0497c6008
commit 3b1ba8ba70
2 changed files with 256 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

471
Installation/changes.html
View File

File diff suppressed because it is too large Load Diff

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

@ -11,14 +11,14 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
cgal_setup_module_path()
if(NOT USE_CGAL_FILE_INCLUDED)
if(NOT USE_CGAL_FILE_INCLUDED)
set(USE_CGAL_FILE_INCLUDED 1)
include(CGAL_Common)
include(CGAL_SetupFlags)
include(CGAL_GeneratorSpecificSettings)
include(CGAL_TweakFindBoost)
set(CGAL_INSTALLED_SCM_BRANCH_NAME ${CGAL_SCM_BRANCH_NAME})
set(CGAL_SCM_BRANCH_NAME "")
@ -39,23 +39,24 @@ if(NOT USE_CGAL_FILE_INCLUDED)
endforeach()
use_essential_libs()
include_directories( "${CMAKE_CURRENT_BINARY_DIR}" )
include_directories( "${CMAKE_CURRENT_BINARY_DIR}" )
# need to get variable from cache while compiling CGAL, while in a demo it is set in CGALConfig.cmake
if ( NOT CGAL_LIBRARY )
if ( NOT CGAL_LIBRARY )
cache_get(CGAL_LIBRARY)
endif()
add_to_list( CGAL_LIBRARIES ${CGAL_LIBRARY} )
#message (STATUS "LIB: ${CGAL_LIBRARY}")
#message (STATUS "LIBS: ${CGAL_LIBRARIES}")
include_directories ( ${CGAL_INCLUDE_DIRS})
include_directories ( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} )
add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_DEFINITIONS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
link_libraries ( ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
endif()