Merge branch '5.2.x-branch'

# Conflicts:
#	Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt
#	Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
#	Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
#	Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
#	Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt
#	Ridges_3/examples/Ridges_3/CMakeLists.txt
#	Shape_detection/examples/Shape_detection/CMakeLists.txt
This commit is contained in:
Laurent Rineau 2021-03-03 18:27:54 +01:00
commit f51ee121db
1 changed files with 1 additions and 1 deletions

View File

@ -10,7 +10,7 @@ find_package(CGAL REQUIRED)
if (MSVC)
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
# Allow Windows 32bit applications to use up to 3GB of RAM
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
endif()
# Prints new compilation options
message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )