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

build_cgal_library -> collect_cgal_library (new macro name)

This commit is contained in:
Eric Berberich 2012-01-10 18:17:53 +00:00
parent 10af9912d9
commit 00d31036ea
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CGALimageIO/src/CGALImageIO/CMakeLists.txt
View File

@ -45,7 +45,7 @@ if(OPENGL_FOUND)
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} )
build_cgal_library( CGAL_ImageIO CGALImageIO "")
collect_cgal_library( CGAL_ImageIO CGALImageIO "")
add_dependencies( CGAL_ImageIO CGAL )

2
Core/src/CGALCore/CMakeLists.txt
View File

@ -10,7 +10,7 @@ include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
build_cgal_library(CGAL_Core CGALCore "")
collect_cgal_library(CGAL_Core CGALCore "")
target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )

2
GraphicsView/src/CGALQt4/CMakeLists.txt
View File

@ -68,7 +68,7 @@ if( QT4_FOUND )
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )
build_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}")
collect_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}")
add_dependencies( CGAL_Qt4 CGAL )

2
Installation/src/CGAL/CMakeLists.txt
View File

@ -1,6 +1,6 @@
message(STATUS "Configure libCGAL")
build_cgal_library(CGAL CGAL "")
collect_cgal_library(CGAL CGAL "")
use_lib( GMP "###")
use_lib( MPFR "###")

2
Installation/src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
macro (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES)
macro (collect_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES)
# IMPORTANT: First delete all_files.cpp
if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp)
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp)

2
Qt_widget/src/CGALQt3/CMakeLists.txt
View File

@ -61,7 +61,7 @@ if( QT3_FOUND )
# message(STATUS QT3-mocfiles: ${CGAL_Qt3_MOC_FILES})
build_cgal_library( CGAL_Qt3 CGALQt3 "${CGAL_Qt3_MOC_FILES}")
collect_cgal_library( CGAL_Qt3 CGALQt3 "${CGAL_Qt3_MOC_FILES}")
foreach(mocfile ${CGAL_Qt3_MOC_FILES})
add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${CMAKE_CURRENT_BINARY_DIR}/${mocfile})