From 7096125038c724e09a37b7878c63d53d6ef855a4 Mon Sep 17 00:00:00 2001 From: ppphp Date: Mon, 13 May 2024 23:55:59 +0800 Subject: [PATCH] fix some warnings: cmake string quotes and float mark (#13909) Co-authored-by: liukaiwen --- .../SetGlobalCompilerAndLinkerSettings.cmake | 4 ++-- tests/src/Mod/Mesh/App/Core/KDTree.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake b/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake index 29961c3fa7..fc734d5f84 100644 --- a/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake +++ b/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake @@ -37,8 +37,8 @@ macro(SetGlobalCompilerAndLinkerSettings) if(FREECAD_RELEASE_SEH) # remove /EHsc or /EHs flags because they are incompatible with /EHa if (${CMAKE_BUILD_TYPE} MATCHES "Release") - string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - string(REPLACE "/EHs" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE "/EHs" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHa") endif() endif(FREECAD_RELEASE_SEH) diff --git a/tests/src/Mod/Mesh/App/Core/KDTree.cpp b/tests/src/Mod/Mesh/App/Core/KDTree.cpp index 7935f3da0e..b6f705e863 100644 --- a/tests/src/Mod/Mesh/App/Core/KDTree.cpp +++ b/tests/src/Mod/Mesh/App/Core/KDTree.cpp @@ -8,14 +8,14 @@ class KDTreeTest: public ::testing::Test protected: void SetUp() override { - points.emplace_back(0, 0, 0); - points.emplace_back(0, 0, 1); - points.emplace_back(0, 1, 0); - points.emplace_back(0, 1, 1); - points.emplace_back(1, 0, 0); - points.emplace_back(1, 0, 1); - points.emplace_back(1, 1, 0); - points.emplace_back(1, 1, 1); + points.emplace_back(0.F, 0.F, 0.F); + points.emplace_back(0.F, 0.F, 1.F); + points.emplace_back(0.F, 1.F, 0.F); + points.emplace_back(0.F, 1.F, 1.F); + points.emplace_back(1.F, 0.F, 0.F); + points.emplace_back(1.F, 0.F, 1.F); + points.emplace_back(1.F, 1.F, 0.F); + points.emplace_back(1.F, 1.F, 1.F); } void TearDown() override