From: Magnus Lundborg Date: Wed, 12 Feb 2014 08:02:24 +0000 (+0100) Subject: Removed option to use OpenMP with the TNG library. X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=38504456937f7b28b8546da6f13de7549d637187;p=alexxy%2Fgromacs.git Removed option to use OpenMP with the TNG library. OpenMP was only used for compiling a few of the examples. With the latest version of the TNG library the detection is done when compiling those examples and skipping them if OpenMP is not available. Fixes #1432 Change-Id: I76df67b10067f2fbc57a4cf0b1825875239e435d --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c2eb723220..e2dab23cf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -782,8 +782,6 @@ if(GMX_USE_TNG) set(TNG_BUILD_FORTRAN OFF CACHE BOOL "Build Fortran compatible TNG library and examples for testing") set(TNG_BUILD_EXAMPLES OFF CACHE BOOL "Build examples showing usage of the TNG API") set(TNG_BUILD_COMPRESSION_TESTS OFF CACHE BOOL "Build tests of the TNG compression library") - # TODO reconsider use of OpenMP in TNG if/when trajectory writing is not serial in mdrun - set(TNG_USE_OPENMP ${GMX_OPENMP} CACHE BOOL "Try to use the OpenMP library (if available) with TNG") set(TNG_BUILD_DOCUMENTATION OFF CACHE BOOL "Use Doxygen to create the HTML based TNG API documentation") set(TNG_BUILD_TEST OFF CACHE BOOL "Build TNG testing binary.") add_subdirectory(${CMAKE_SOURCE_DIR}/src/external/tng_io) @@ -792,7 +790,6 @@ endif() mark_as_advanced(TNG_BUILD_FORTRAN) mark_as_advanced(TNG_BUILD_EXAMPLES) mark_as_advanced(TNG_BUILD_COMPRESSION_TESTS) -mark_as_advanced(TNG_USE_OPENMP) mark_as_advanced(TNG_BUILD_DOCUMENTATION) mark_as_advanced(TNG_BUILD_TEST) mark_as_advanced(TNG_EXAMPLE_FILES_DIR)