From db9d46e4bb9fe837deaa063faaa01e8eb5b37e61 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 21 Mar 2023 22:04:08 +0100
Subject: [PATCH] C++17: remove workaround for external smesh to fix build
 failure on Conda

---
 src/Mod/Fem/App/CMakeLists.txt      | 6 ------
 src/Mod/Fem/Gui/CMakeLists.txt      | 6 ------
 src/Mod/MeshPart/App/CMakeLists.txt | 6 ------
 src/Mod/MeshPart/Gui/CMakeLists.txt | 6 ------
 4 files changed, 24 deletions(-)

diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index e419e7f105..ea04bbf9c1 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -204,12 +204,6 @@ if(OpenMP_CXX_FOUND)
 	target_link_libraries(Fem OpenMP::OpenMP_CXX)
 endif()
 
-# external SMESH doesn't support C++17 yet
-if(FREECAD_USE_EXTERNAL_SMESH)
-    set_target_properties(Fem PROPERTIES CXX_STANDARD_REQUIRED ON)
-    set_target_properties(Fem PROPERTIES CXX_STANDARD 14)
-endif()
-
 
 SET_BIN_DIR(Fem Fem /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(Fem)
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 86751cd2e9..0a61be364b 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -361,12 +361,6 @@ SET(FemGuiIcon_SVG
 add_library(FemGui SHARED ${FemGui_SRCS} ${FemGuiIcon_SVG})
 target_link_libraries(FemGui ${FemGui_LIBS} ${VTK_LIBRARIES})
 
-# external SMESH doesn't support C++17 yet
-if(FREECAD_USE_EXTERNAL_SMESH)
-    set_target_properties(FemGui PROPERTIES CXX_STANDARD_REQUIRED ON)
-    set_target_properties(FemGui PROPERTIES CXX_STANDARD 14)
-endif()
-
 
 fc_copy_sources(FemGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Fem" ${FemGuiIcon_SVG})
 
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index 86b6226df0..6ee9deb4eb 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -79,12 +79,6 @@ endif()
 add_library(MeshPart SHARED ${MeshPart_SRCS} ${MeshPart_Scripts})
 target_link_libraries(MeshPart ${MeshPart_LIBS})
 
-# external SMESH doesn't support C++17 yet
-if(FREECAD_USE_EXTERNAL_SMESH)
-    set_target_properties(MeshPart PROPERTIES CXX_STANDARD_REQUIRED ON)
-    set_target_properties(MeshPart PROPERTIES CXX_STANDARD 14)
-endif()
-
 
 fc_target_copy_resource_flat(MeshPart
     ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index 9ebb639fc2..4cba92e295 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -81,12 +81,6 @@ endif(FREECAD_USE_PCH)
 add_library(MeshPartGui SHARED ${MeshPartGui_SRCS} ${MeshPartGui_Scripts} ${FLATMESH_PY_SRCS})
 target_link_libraries(MeshPartGui ${MeshPartGui_LIBS})
 
-# external SMESH doesn't support C++17 yet
-if(FREECAD_USE_EXTERNAL_SMESH)
-    set_target_properties(MeshPartGui PROPERTIES CXX_STANDARD_REQUIRED ON)
-    set_target_properties(MeshPartGui PROPERTIES CXX_STANDARD 14)
-endif()
-
 
 SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart)
 SET_PYTHON_PREFIX_SUFFIX(MeshPartGui)