kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

C++17: remove workaround for external smesh to fix build failure on Conda

Browse Source
This commit is contained in:
wmayer
2023-03-21 22:04:08 +01:00
committed by wwmayer
parent 20227aa392
commit db9d46e4bb
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Fem/App/CMakeLists.txt
View File

@@ -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)

6
src/Mod/Fem/Gui/CMakeLists.txt
View File

@@ -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})

6
src/Mod/MeshPart/App/CMakeLists.txt
View File

@@ -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}

6
src/Mod/MeshPart/Gui/CMakeLists.txt
View File

@@ -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)