diff --git a/CMakeLists.txt b/CMakeLists.txt index baec8682f..71e51d277 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,6 +161,7 @@ message(STATUS " CMAKE_THREAD_LIBS_INIT=${CMAKE_THREAD_LIBS_INIT}") message(STATUS " CMAKE_USE_PTHREADS_INIT=${CMAKE_USE_PTHREADS_INIT}") message(STATUS " HAVE_ECCODES_THREADS=${HAVE_ECCODES_THREADS}") + set( GRIB_PTHREADS 0 ) set( GRIB_OMP_THREADS 0 ) set( GRIB_LINUX_PTHREADS 0 ) @@ -297,15 +298,16 @@ if( EC_HAVE_FORTRAN ) list( APPEND ECCODES_LIBRARIES eccodes_f90 ) endif() +# Bundle if( NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME ) set( ECCODES_FOUND TRUE PARENT_SCOPE ) set( ECCODES_DEFINITIONS ${ECCODES_DEFINITIONS} PARENT_SCOPE )# includes already TPL definitions set( ECCODES_INCLUDE_DIRS ${ECCODES_INCLUDE_DIRS} ${ECCODES_EXTRA_INCLUDE_DIRS} PARENT_SCOPE ) set( ECCODES_LIBRARIES ${ECCODES_LIBRARIES} ${ECCODES_EXTRA_LIBRARIES} ${CMATH_LIBRARIES} PARENT_SCOPE ) - set( ECCODES_SAMPLES_PATH ${ECCODES_SAMPLES_PATH} PARENT_SCOPE ) - set( ECCODES_IFS_SAMPLES_PATH ${ECCODES_IFS_SAMPLES_PATH} PARENT_SCOPE ) - set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE ) set( ECCODES_INSTALL_EXTRA_TOOLS ${ECCODES_INSTALL_EXTRA_TOOLS} PARENT_SCOPE ) + set( ECCODES_DEFINITION_PATH ${CMAKE_BINARY_DIR}/${ECCODES_DEFINITION_SUFF} PARENT_SCOPE ) + set( ECCODES_SAMPLES_PATH ${CMAKE_BINARY_DIR}/${ECCODES_SAMPLES_SUFF} PARENT_SCOPE ) + set( ECCODES_IFS_SAMPLES_PATH ${CMAKE_BINARY_DIR}/${ECCODES_IFS_SAMPLES_SUFF} PARENT_SCOPE ) endif() # pkg-config