#674 closed defect (fixed)
VoronoiDiagramBuilder uses fmax which breaks MSVC11 build
Reported by: | Twiddeldidu | Owned by: | strk |
---|---|---|---|
Priority: | major | Milestone: | 3.6.1 |
Component: | Default | Version: | main |
Severity: | Unassigned | Keywords: | msvc |
Cc: |
Description
The build configuration already has defined NOMINMAX in the CMakeLists.txt but there is still a compiling issue with msvc11 (x64) and CMake.
elseif(MSVC) # Set pedantic mode by default #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") if(MSVC80 OR MSVC90 OR MSVC10 OR MSVC11) # Option is to enable the /MP switch for Visual Studio 2005 or later option(GEOS_MSVC_ENABLE_MP "Set to ON to build GEOS with the /MP option (Visual Studio 2005 and above)." ON) mark_as_advanced(GEOS_MSVC_ENABLE_MP) if(GEOS_MSVC_ENABLE_MP) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") endif() message(STATUS "Setting Visual Studio 2005+ option /MP to ${GEOS_MSVC_ENABLE_MP}") add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS) == add_definitions(-DNOMINMAX) == endif() endif()
There is a problem with VoronoiDiagramBuilder.cpp because it uses fmax. I made a quick patch changing this to the generic std::max instead of using fmax.
Attachments (2)
Change History (6)
by , 11 years ago
Attachment: | VoronoiDiagramBuilder.cpp.patch added |
---|
by , 11 years ago
Attachment: | QuadEdgeSubdivisionTest.cpp.patch added |
---|
Fix for QuadEdgeSubdivisionTest
comment:2 by , 11 years ago
Owner: | changed from | to
---|---|
Status: | new → assigned |
r3962 in trunk. Please check.
comment:3 by , 10 years ago
Resolution: | → fixed |
---|---|
Status: | assigned → closed |
Assuming fixed (after 10 months of no feedback...)
Note:
See TracTickets
for help on using tickets.
Patch for VoronoiDiagramBuilder