diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt index 28e0d669a52..96108a77039 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt @@ -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 ) diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index 9aece64e6ec..5fde3d1ea50 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -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} ) diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index bd5820d549d..82840166268 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -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 ) diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 4f6d26b377c..deed5f3032e 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -1,6 +1,6 @@ message(STATUS "Configure libCGAL") -build_cgal_library(CGAL CGAL "") +collect_cgal_library(CGAL CGAL "") use_lib( GMP "###") use_lib( MPFR "###") diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index c63852498da..33554d386f5 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -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) diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt index 8850b97c93c..461c234931d 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGALQt3/CMakeLists.txt @@ -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})