Feel free to join the next Helmholtz Hacky Hour #26 on Wednesday, April 21, 2021 from 2PM to 3PM!

Commit af44346e authored by Stephan Thober's avatar Stephan Thober

Merge branch 'develop' into edk_time_buffer

parents 92064c52 5bc4f100
......@@ -26,7 +26,7 @@ set(CMAKE_WITH_MPI OFF CACHE STRING "build the module with MPI, so it can be exe
# same with OpenMP
set(CMAKE_WITH_OpenMP OFF CACHE STRING "build the module with OpenMP parallelization")
# same with lapack
set(CMAKE_WITH_LAPACK OFF CACHE STRING "build the module with lapack library")
set(CMAKE_WITH_LAPACK ON CACHE STRING "build the module with lapack library")
# additional cmake-modules created for the purpose of finding netCDF or other libraries ly in the source_directory in
# a folder named cmake-modules. This command tells cmake to search there for Find<module>.cmake files
......
......@@ -52,7 +52,7 @@ Some cygwin versions create a new home directory for you. You may check e.g. her
### Ubuntu, Mint and other apt-get based systems with matching repositories:
sudo apt-get install git # (optional)
sudo apt-get install gfortran netcdf-bin libnetcdf-dev libnetcdff-dev cmake
sudo apt-get install gfortran netcdf-bin libnetcdf-dev libnetcdff-dev cmake libblas-dev liblapack-dev
### Archlinux:
......
......@@ -63,7 +63,7 @@ if (NOT FOUND_NETCDFF_MODULE)
execute_process(COMMAND ${NETCDFF_CONFIG} --flibs OUTPUT_VARIABLE NETCDF_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "netcdff netcdf library link flags ${NETCDF_LDFLAGS}")
if (CMAKE_BUILD_MODULE_SYSTEM_INDEPENDEND)
if (CMAKE_BUILD_MODULE_SYSTEM_INDEPENDENT)
find_program(NETCDF_CONFIG nc-config
HINTS ${CMAKE_NETCDF_DIR})
execute_process(COMMAND ${NETCDF_CONFIG} --libs OUTPUT_VARIABLE NETCDF_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
......@@ -84,7 +84,7 @@ if (NOT FOUND_NETCDFF_MODULE)
if (flag MATCHES "^-l(.*)")
set(_pkg_search "${CMAKE_MATCH_1}")
else()
list(APPEND _link_flags "${flag}")
string(CONCAT _link_flags "${_link_flags}" " " "${flag}")
continue()
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment