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

Merge remote-tracking branch 'cgal/6.1.x-branch' into 'cgal/main'

This commit is contained in:
Sébastien Loriot 2025-09-09 19:56:20 +02:00
parent 106f9659b1 6bf6331967
commit 1f4a934d0f
6 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CGAL_Core/include/CGAL/CORE/Config.h
View File

@ -29,12 +29,10 @@
#include <CGAL/export/CORE.h> #include <CGAL/export/CORE.h>
#ifdef CGAL_TEST_SUITE #ifdef CGAL_CORE_DEBUG
// disabled for the testsuite to avoid `w`
#define CGAL_CORE_warning_msg(X ,Y)
// if (!(X)) CGAL_error_msg(Y)
#else
#define CGAL_CORE_warning_msg(X ,Y) CGAL_warning_msg(X ,Y) #define CGAL_CORE_warning_msg(X ,Y) CGAL_warning_msg(X ,Y)
#else
#define CGAL_CORE_warning_msg(X ,Y)
#endif #endif

2
Installation/cmake/modules/CGALHelpers.cmake
View File

@ -9,7 +9,7 @@ function(process_CGAL_subdirectory entry subdir type_name)
make_directory("${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}") make_directory("${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}")
endif() endif()
message("\n-- Configuring ${subdir} in ${subdir}/${ENTRY_DIR_NAME}") message("-- Configuring ${subdir} in ${subdir}/${ENTRY_DIR_NAME}")
set(source_dir "") set(source_dir "")
if(EXISTS ${entry}/CMakeLists.txt) if(EXISTS ${entry}/CMakeLists.txt)

18
Installation/demo/CMakeLists.txt
View File

@ -1,7 +1,15 @@
cmake_minimum_required(VERSION 3.12...3.31) cmake_minimum_required(VERSION 3.12...3.31)
project(CGAL_Demos)
if(NOT CGAL_MODULES_DIR) file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
find_package(CGAL REQUIRED) list(SORT pkgs)
endif()
include(${CGAL_MODULES_DIR}/CGALHelpers.cmake) message("== Generating build files for demos ==")
CGAL_handle_subdirectories(demo demos) foreach(pkg ${pkgs})
set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
message("\n-- Configuring ${pkg}")
add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
endif()
endforeach()
message("== Generating build files for done (DONE) ==")

19
Installation/examples/CMakeLists.txt
View File

@ -1,6 +1,15 @@
cmake_minimum_required(VERSION 3.12...3.31) cmake_minimum_required(VERSION 3.12...3.31)
if(NOT CGAL_MODULES_DIR) project(CGAL_Examples)
find_package(CGAL REQUIRED)
endif() file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
include(${CGAL_MODULES_DIR}/CGALHelpers.cmake) list(SORT pkgs)
CGAL_handle_subdirectories(examples examples)
message("== Generating build files for examples ==")
foreach(pkg ${pkgs})
set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
message("\n-- Configuring ${pkg}")
add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
endif()
endforeach()
message("== Generating build files for done (DONE) ==")

17
Installation/test/CMakeLists.txt
View File

@ -1,8 +1,15 @@
cmake_minimum_required(VERSION 3.12...3.31) cmake_minimum_required(VERSION 3.12...3.31)
project(CGAL_Tests)
file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
list(SORT pkgs)
if(NOT CGAL_MODULES_DIR) message("== Generating build files for tests ==")
find_package(CGAL REQUIRED) foreach(pkg ${pkgs})
endif() set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
include(${CGAL_MODULES_DIR}/CGALHelpers.cmake) if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
CGAL_handle_subdirectories(test tests) message("\n-- Configuring ${pkg}")
add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
endif()
endforeach()
message("== Generating build files for done (DONE) ==")

2
Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp
View File

@ -102,7 +102,7 @@ int main()
} }
// create compact metric approximation algorithm instance // create compact metric approximation algorithm instance
std::cout << "create compact vas instance" << std::endl; std::cout << "create compact vsa instance" << std::endl;
Compact_metric_point_proxy error_metric(center_pmap, area_pmap); Compact_metric_point_proxy error_metric(center_pmap, area_pmap);
Compact_approx approx(mesh, vpmap, error_metric); Compact_approx approx(mesh, vpmap, error_metric);