Fixes for static linking

wdeconinck · Nov 9, 2020 · d300465 · d300465
1 parent 66f0003
commit d300465
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git 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()
+endif()
diff --git 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';