From ef683ea951d4239a733606de53047cd6ff20fbe0 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 26 Sep 2018 21:22:58 +0200 Subject: [PATCH] FEM: SMESH, update internal version number --- CMakeLists.txt | 9 +++++---- src/3rdParty/salomesmesh/CMakeLists.txt | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 439c581f44..2b32aa4950 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -650,10 +650,11 @@ endif() # Salome SMESH sources are under src/3rdParty now IF(BUILD_SMESH) # set the internal smesh version: - set(SMESH_VERSION_MAJOR 5) # in src/3rdParty it says smesh is version 5.*, is this true? - set(SMESH_VERSION_MINOR 1) - set(SMESH_VERSION_PATCH 2) - set(SMESH_VERSION_TWEAK 2) + # see src/3rdParty/salomonemesh/CMakeLists.txt and commit https://github.com/FreeCAD/FreeCAD/commit/666a3e5 and https://forum.freecadweb.org/viewtopic.php?f=10&t=30838 + set(SMESH_VERSION_MAJOR 7) + set(SMESH_VERSION_MINOR 7) + set(SMESH_VERSION_PATCH 1) + set(SMESH_VERSION_TWEAK 0) #if we use smesh we definitely also need vtk, no matter of external or internal smesh set (VTK_COMPONENTS diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 303ae6e0aa..10025d8043 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -1,10 +1,10 @@ # SGEOM cmake build file #PROJECT(SMESH Fortran CXX) -SET(SMESH_VERSION_MAJOR 5) -SET(SMESH_VERSION_MINOR 1) -SET(SMESH_VERSION_PATCH 2) -SET(SMESH_VERSION_TWEAK 2) +SET(SMESH_VERSION_MAJOR 7) # see main CMakeLists.txt of FreeCAD +SET(SMESH_VERSION_MINOR 7) +SET(SMESH_VERSION_PATCH 1) +SET(SMESH_VERSION_TWEAK 0) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment -Wno-unused-parameter")