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

Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF 

Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components
This commit is contained in:
Laurent Rineau 2019-10-18 14:17:15 +02:00
parent 59398afe51 13bd01d38c
commit be0c21cfa4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
View File

@ -69,6 +69,11 @@ function(create_single_source_cgal_program firstfile )
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )
target_link_libraries(${exe_name} PRIVATE CGAL::CGAL)
foreach(comp ${CGAL_REQUESTED_COMPONENTS})
if(TARGET CGAL::CGAL_${comp})
target_link_libraries(${exe_name} PRIVATE CGAL::CGAL_${comp})
endif()
endforeach()
if(CGAL_3RD_PARTY_LIBRARIES)
target_link_libraries(${exe_name} PRIVATE ${CGAL_3RD_PARTY_LIBRARIES})
endif()

9
Scripts/scripts/cgal_create_CMakeLists
View File

@ -468,11 +468,10 @@ EOF
echo
echo "# Link the executable to CGAL and third-party libraries"
LIBS=""
if [ "$qt4" = "y" ]; then
LIBS="\${QT_LIBRARIES}"
fi
LIBS=$LIBS" \${CGAL_LIBRARIES} \${CGAL_3RD_PARTY_LIBRARIES}"
echo "target_link_libraries(${target_name} $LIBS )"
for comp in ${CGAL_COMPONENTS}; do
LIBS=$LIBS" CGAL::CGAL_${comp}"
done
echo "target_link_libraries(${target_name} PRIVATE CGAL::CGAL${LIBS} )"
fi # single source or all files #===========================================