core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1268: Second try

This commit is contained in:
Shahram Najm 2021-07-29 15:31:38 +01:00
parent 1091465206
commit 0c69cc9658
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -274,7 +274,7 @@ if( HAVE_ECCODES_THREADS )
ecbuild_critical("Pthreads is not supported on your system: thread library found=[${CMAKE_THREAD_LIBS_INIT}]") ecbuild_critical("Pthreads is not supported on your system: thread library found=[${CMAKE_THREAD_LIBS_INIT}]")
endif() endif()
set( GRIB_PTHREADS 1 ) set( GRIB_PTHREADS 1 )
# set( THREADS_LIBRARIES Threads::Threads ) set( ECCODES_PTHREADS_LIBRARIES Threads::Threads ) # ECC-1268
if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
set( GRIB_LINUX_PTHREADS 1 ) set( GRIB_LINUX_PTHREADS 1 )
endif() endif()

3
fortran/CMakeLists.txt
View File

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