ECC-1268: Second try

Metamess · Jul 29, 2021 · 0c69cc9 · 0c69cc9
1 parent 1091465
commit 0c69cc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -274,7 +274,7 @@ if( HAVE_ECCODES_THREADS )
         ecbuild_critical("Pthreads is not supported on your system: thread library found=[${CMAKE_THREAD_LIBS_INIT}]")
     endif()
     set( GRIB_PTHREADS 1 )
-    # set( THREADS_LIBRARIES Threads::Threads )
+    set( ECCODES_PTHREADS_LIBRARIES Threads::Threads ) # ECC-1268
     if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
         set( GRIB_LINUX_PTHREADS 1 )
     endif()

diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
@@ -49,8 +49,7 @@ if( HAVE_FORTRAN )
                          GENERATED       grib_f90.f90 eccodes_f90.f90
                          PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
                                          $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
-                         PRIVATE_LIBS    eccodes )
-                         # PRIVATE_LIBS    eccodes ${THREADS_LIBRARIES} )
+                         PRIVATE_LIBS    eccodes ${ECCODES_PTHREADS_LIBRARIES} )
 
     if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 )
         # Installed module directory is not in the PUBLIC INCLUDES!