2018-04-10 11:51:36 +00:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 3ecfe23a6..246bb15a8 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -445,7 +445,6 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
|
|
|
|
|
|
|
|
|
|
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677598
|
|
|
|
|
# Acceptable versions of Python
|
|
|
|
|
-set(Python_ADDITIONAL_VERSIONS "2.7")
|
|
|
|
|
|
|
|
|
|
# For building on OS X
|
|
|
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|
|
|
|
diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
|
|
|
|
|
index 303ae6e0a..9c10046e6 100644
|
|
|
|
|
--- a/src/3rdParty/salomesmesh/CMakeLists.txt
|
|
|
|
|
+++ b/src/3rdParty/salomesmesh/CMakeLists.txt
|
|
|
|
|
@@ -379,6 +379,7 @@ if (BUILD_FEM_NETGEN)
|
|
|
|
|
FILE(GLOB NETGENPlugin_source_files src/NETGENPlugin/*.cpp inc/NETGENPlugin_*.h* )
|
|
|
|
|
ADD_LIBRARY(NETGENPlugin SHARED ${NETGENPlugin_source_files})
|
|
|
|
|
TARGET_LINK_LIBRARIES(NETGENPlugin SMDS SMESHDS SMESH StdMeshers ${SMESH_LIBS} )
|
|
|
|
|
+set_property(TARGET NETGENPlugin PROPERTY CXX_STANDARD 14)
|
|
|
|
|
|
|
|
|
|
SET_BIN_DIR(NETGENPlugin NETGENPlugin)
|
|
|
|
|
if(WIN32)
|
|
|
|
|
diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
|
|
|
|
|
index 3b66ec663..3d4bc8afd 100644
|
|
|
|
|
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
|
|
|
|
|
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
|
|
|
|
|
@@ -38,6 +38,7 @@
|
|
|
|
|
#include <GC_MakeSegment.hxx>
|
|
|
|
|
#include <GeomAPI_ExtremaCurveCurve.hxx>
|
|
|
|
|
#include <Geom_Line.hxx>
|
|
|
|
|
+#include <Quantity_Parameter.hxx>
|
|
|
|
|
#include <IntAna_IntConicQuad.hxx>
|
|
|
|
|
#include <IntAna_Quadric.hxx>
|
|
|
|
|
#include <gp_Lin.hxx>
|
2018-08-28 11:59:48 +00:00
|
|
|
diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py
|
|
|
|
|
index e4b5c8d44..211a4c95a 100644
|
|
|
|
|
--- a/src/Mod/Test/TestApp.py
|
|
|
|
|
+++ b/src/Mod/Test/TestApp.py
|
|
|
|
|
@@ -66,8 +66,7 @@ def All():
|
|
|
|
|
"Menu" ]
|
|
|
|
|
|
|
|
|
|
# add the module tests
|
|
|
|
|
- tests += [ "TestFem",
|
|
|
|
|
- "MeshTestsApp",
|
|
|
|
|
+ tests += [ "MeshTestsApp",
|
|
|
|
|
"TestSketcherApp",
|
|
|
|
|
"TestPartApp",
|
|
|
|
|
"TestPartDesignApp",
|
|
|
|
|
diff --git a/src/Mod/Test/TestGui.py b/src/Mod/Test/TestGui.py
|
|
|
|
|
index ae5712bfc..7fbc2760c 100644
|
|
|
|
|
--- a/src/Mod/Test/TestGui.py
|
|
|
|
|
+++ b/src/Mod/Test/TestGui.py
|
|
|
|
|
@@ -47,7 +47,6 @@ class TestCmd:
|
|
|
|
|
QtUnitGui.addTest("Document")
|
|
|
|
|
QtUnitGui.addTest("UnicodeTests")
|
|
|
|
|
QtUnitGui.addTest("MeshTestsApp")
|
|
|
|
|
- QtUnitGui.addTest("TestFem")
|
|
|
|
|
QtUnitGui.addTest("TestSketcherApp")
|
|
|
|
|
QtUnitGui.addTest("TestPartApp")
|
|
|
|
|
QtUnitGui.addTest("TestPartDesignApp")
|
