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

23
Installation/changes.html
View File

@ -107,6 +107,27 @@ David A. Wheeler's 'SLOCCount'</a>, restricted to the <code>include/CGAL/</code>
<div> <div>
<p> Release date: </p> <p> Release date: </p>
<h3>Installation</h3>
<ul>
<li>This is the last release whose <tt>UseCGAL.cmake</tt> file (if
using CGAL in a CMake build environment)
contains the line <code>link_libraries(${CGAL_LIBRARIES_DIR}
${CGAL_3RD_PARTY_LIBRARIES_DIRS})</code>, as this is a deprecated
CMake command. The correct way to link with CGAL's libraries (as for
required 3rd party libraries) is to use
<code>target_link_libraries</code> which specifies for each build target
which libraries should be linked. The following serves as example:
<pre>
find_package(CGAL)
include(${CGAL_USE_FILE})
add_executable(myexe main.cpp)
target_link_libraries(myexe ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})</pre>
We also expect further changes in CGAL's CMake setup (change of
variable names, consistency of filename and output, removing
essential libraries, building executables, removal of <code>${CGAL_3RD_PARTY_LIBRARIES}</code>).
</li>
</ul>
<h3>3D Fast Intersection and Distance Computation</h3> <h3>3D Fast Intersection and Distance Computation</h3>
<ul> <ul>
<li> Update requirements of the concepts <code>AABBTraits</code> and <code>AABBGeomTraits</code> to match the implementation of the package. <li> Update requirements of the concepts <code>AABBTraits</code> and <code>AABBGeomTraits</code> to match the implementation of the package.
@ -137,7 +158,7 @@ David A. Wheeler's 'SLOCCount'</a>, restricted to the <code>include/CGAL/</code>
<ul> <ul>
<li> Add a constructor for <code>Regular_triangulation_2</code> and <code>Delaunay_triangulation_2</code> from a range of points or a range of points with info. <li> Add a constructor for <code>Regular_triangulation_2</code> and <code>Delaunay_triangulation_2</code> from a range of points or a range of points with info.
</ul> </ul>
</div>
<h2 id="release4.1">Release 4.1 </h2> <h2 id="release4.1">Release 4.1 </h2>

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

@ -56,6 +56,7 @@ if(NOT USE_CGAL_FILE_INCLUDED)
add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_DEFINITIONS} ) 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() endif()