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

Merge branch 'releases/CGAL-4.6-branch' 

This merge imports the following merge commits:
- Merge pull request #132 from lrineau/Installation-fix_configure_component-pmoeller_rebased_4.6
- Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
- Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
This commit is contained in:
Laurent Rineau 2015-06-25 11:28:30 +02:00
parent 5f8116e075 71ab8ea9aa
commit d4b4e1720b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Installation/src/CMakeLists.txt
View File

@ -117,8 +117,9 @@ set(CGAL_CONFIGURED_LIBRARIES "")
foreach(package ${CGAL_CONFIGURED_PACKAGES})
file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile} PATH)
get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${CGAL_CONFIGURED_LIBRARY_NAME} NAME)
if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")