diff --git a/.idea/developer-tools.xml b/.idea/developer-tools.xml new file mode 100644 index 0000000000000000000000000000000000000000..5421cc50d348733a3523cf13e5256335963863fd --- /dev/null +++ b/.idea/developer-tools.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="DeveloperToolsToolWindowSettingsV1" lastSelectedContentNodeId="base64-encoder-decoder"> + <developerToolsConfigurations /> + </component> +</project> \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c3c833509907e8480f56076432ae66ac29e689ef..4c84608f523d10bdd54558e649337eb25a085569 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,15 +26,15 @@ set(src_io add_library(lib_scm_io ${src_io}) #NetCDF handling execute_process ( - COMMAND bash -c "nc-config --fflags | grep -Eo '^[^ ]+' | tr -d '\n'" + COMMAND bash -c "nf-config --fflags | grep -Eo '^[^ ]+' | tr -d '\n'" OUTPUT_VARIABLE netcdf_inc ) cmake_path(SET netcfd_inc_dir " ${netcdf_inc}" ) message("CMake path is ${netcdf_inc}") target_compile_options(lib_scm_io PRIVATE ${netcdf_inc}) -#include_directories(${netcdf_inc}) +include_directories(${netcdf_inc}) execute_process ( - COMMAND bash -c "nc-config --flibs | tr -d '\n'" + COMMAND bash -c "nf-config --flibs | tr -d '\n'" OUTPUT_VARIABLE temp ) separate_arguments(netcdff_libs UNIX_COMMAND "${temp}") @@ -44,7 +44,7 @@ execute_process ( ) separate_arguments(netcdf_libs UNIX_COMMAND "${temp}") execute_process ( - COMMAND bash -c "nc-config --static | tr -d '\n'" + COMMAND bash -c "nc-config --all | grep -Eo '\-\-static.*' | cut -d ' ' -f10- | tr -d '\n'" OUTPUT_VARIABLE temp ) separate_arguments(netcdf_static UNIX_COMMAND "${temp}")