X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=cd223ad80e5bc79688b218912294260f016c2d71;hb=1f4550c491fdfc33f0275854d8dc9e46c5d09375;hp=9d8acde2f37ab3d69ec3137ac259df8329b93cda;hpb=b0dd4fd16f6a784727814516399cfd9269aca1b4;p=modules%2Fsmesh.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d8acde2f..cd223ad80 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,15 +58,14 @@ SET(BUILD_SHARED_LIBS TRUE) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # User options -# (some options have already been defined in KERNEL) # ============ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON) # Advanced options: OPTION(SALOME_BUILD_GUI "Enable GUI" ON) -OPTION(SALOME_SMESH_USE_CGNS "Enable shape recognition from picture" OFF) -OPTION(SALOME_SMESH_USE_TBB "Enable shape recognition from picture" OFF) +OPTION(SALOME_SMESH_USE_CGNS "Enable import/export to CGNS format" OFF) +OPTION(SALOME_SMESH_USE_TBB "Enable parallel computation" OFF) #On Linux use Fortran to compile MEFISTO2D IF(NOT WIN32) @@ -173,6 +172,7 @@ FIND_PACKAGE(SalomeCAS REQUIRED) IF(SALOME_SMESH_USE_CGNS) FIND_PACKAGE(SalomeCGNS) SALOME_LOG_OPTIONAL_PACKAGE(CGNS SALOME_SMESH_USE_CGNS) + ADD_DEFINITIONS(-DWITH_CGNS) ENDIF(SALOME_SMESH_USE_CGNS) IF(SALOME_SMESH_USE_TBB)