Revert "smesh: [skip ci] build FEM & MeshPart with C++14 when using e…

…xternal smesh because it doesn't support C++17 yet" This reverts commit 5169a7e.
oursland · Mar 14, 2023 · 6ba02f0 · 6ba02f0
1 parent 0b2a2a8
commit 6ba02f0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 26 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -177,7 +177,7 @@ SET(FemConstraints_SRCS
     FemConstraintContact.h
     FemConstraintTransform.cpp
     FemConstraintTransform.h
-)
+    )
 SOURCE_GROUP("Constraints" FILES ${FemConstraints_SRCS})
 
 
@@ -204,13 +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
@@ -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
@@ -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
@@ -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)