Commit 774f5dea authored by Uwe Woessner's avatar Uwe Woessner
Browse files

introduce NOMINMAX to prevent issues with min() and max() in MSVC

parent dea20d66
......@@ -115,6 +115,7 @@ endif()
if(WIN32)
set(CMAKE_INSTALL_PREFIX "C:/OpenPASS" CACHE PATH "Destination directory")
add_compile_definitions(WIN32)
add_compile_definitions(NOMINMAX) #we use c++ min and max from <limits> this prevents windows.h from defining min and max
add_compile_definitions(BOOST_ALL_NO_LIB)
add_compile_definitions(BOOST_ALL_DYN_LINK)
add_compile_definitions(_USE_MATH_DEFINES)
......
......@@ -1036,7 +1036,7 @@ osi3::SensorViewConfiguration OsmpFmuHandler::GenerateDefaultSensorViewConfigura
viewConfiguration.mutable_mounting_position()->mutable_position()->set_z(0.0);
viewConfiguration.set_field_of_view_horizontal(M_2_PI);
viewConfiguration.set_range((std::numeric_limits<double>::max)());
viewConfiguration.set_range(std::numeric_limits<double>::max());
return viewConfiguration;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment