fix some warnings

FreeCAD · May 9, 2024 · 7f5cc12 · 7f5cc12
1 parent 82101ac
commit 7f5cc12
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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