From d3004659f0874e61b8d4b5a30883ee9b8a2b1b07 Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Mon, 9 Nov 2020 19:39:13 +0000 Subject: [PATCH] Fixes for static linking --- cmake/features/OMP.cmake | 10 ++-------- src/atlas/library/Library.cc | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cmake/features/OMP.cmake b/cmake/features/OMP.cmake index f7cbb8e6e..ddae25b1c 100644 --- a/cmake/features/OMP.cmake +++ b/cmake/features/OMP.cmake @@ -1,11 +1,5 @@ ### OMP ... -if( "${CMAKE_VERSION}" VERSION_LESS "3.11" ) - if( ENABLE_OMP ) - ecbuild_warn( "OpenMP only supported with CMake 3.11 onwards" ) - endif() -else() - find_package( OpenMP COMPONENTS CXX ${Fortran} ) -endif() +find_package( OpenMP COMPONENTS CXX ${Fortran} ) ecbuild_add_option( FEATURE OMP DESCRIPTION "support for OpenMP shared memory parallelism" CONDITION OpenMP_Fortran_FOUND OR OpenMP_CXX_FOUND ) @@ -56,4 +50,4 @@ if( HAVE_OMP_CXX ) endif() endif() -endif() \ No newline at end of file +endif() diff --git a/src/atlas/library/Library.cc b/src/atlas/library/Library.cc index 84131b3c7..20d0559b4 100644 --- a/src/atlas/library/Library.cc +++ b/src/atlas/library/Library.cc @@ -483,8 +483,8 @@ void Library::Information::print( std::ostream& out ) const { #ifdef TRANS_HAVE_FAUX out << " trans version (" << trans_version_str() << "), " << "git-sha1 " << trans_git_sha1_abbrev( 7 ) << '\n'; - out << " faux version (" << faux_version_str() << "), " - << "git-sha1 " << faux_git_sha1_abbrev( 7 ) << '\n'; + out << " faux version (" << trans_faux_version_str() << "), " + << "git-sha1 " << trans_faux_git_sha1_abbrev( 7 ) << '\n'; #else out << " transi version (" << transi_version() << "), " << "git-sha1 " << transi_git_sha1_abbrev( 7 ) << '\n';