X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=2f1abc23c14fc72e66a460d397453d535e8a150d;hb=5c9a9bf94086a339c464364b5113edbe4fac3ea9;hp=b77b470bc5127758a31b5f6c068934b19f2d1eeb;hpb=5e6fce40736f6f000f2e5e7d4020e2c5ccea7309;p=modules%2Fsmesh.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b77b470bc..2f1abc23c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -65,7 +65,7 @@ OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON) # Advanced options: OPTION(SALOME_BUILD_GUI "Enable GUI" ON) OPTION(SALOME_SMESH_USE_CGNS "Enable import/export to CGNS format" OFF) -OPTION(SALOME_SMESH_USE_TBB "Enable shape recognition from picture" OFF) +OPTION(SALOME_SMESH_USE_TBB "Enable parallel computation" OFF) #On Linux use Fortran to compile MEFISTO2D IF(NOT WIN32) @@ -178,6 +178,7 @@ ENDIF(SALOME_SMESH_USE_CGNS) IF(SALOME_SMESH_USE_TBB) FIND_PACKAGE(SalomeTBB) SALOME_LOG_OPTIONAL_PACKAGE(TBB SALOME_SMESH_USE_TBB) + ADD_DEFINITIONS(-DWITH_TBB) ENDIF(SALOME_SMESH_USE_TBB) FIND_PACKAGE(SalomeMEDFile REQUIRED)