From 11a9ad57152df41e60f35233a8bf2b12f32e5e9e Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 27 Jul 2020 15:43:33 -0600 Subject: [PATCH] cleanup, update pnetcdf lib --- .travis.yml | 6 +++--- src/clib/CMakeLists.txt | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2072398dae2..2504a0268d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ before_script: - export CC=mpicc - export FC=mpif90 - export CPPFLAGS='-I/usr/include' - - wget https://parallel-netcdf.github.io/Release/pnetcdf-1.11.0.tar.gz - - tar -xzvf pnetcdf-1.11.0.tar.gz + - wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz + - tar -xzvf pnetcdf-1.12.1.tar.gz - ls -l - - pushd pnetcdf-1.11.0 + - pushd pnetcdf-1.12.1 - ./configure --prefix=/usr --enable-shared - make - sudo make install diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt index 8784328ad40..1850376fa09 100644 --- a/src/clib/CMakeLists.txt +++ b/src/clib/CMakeLists.txt @@ -37,7 +37,6 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel") elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") string(APPEND CMAKE_C_FLAGS " -std=c99 ") endif() -#target_compile_options (pioc PRIVATE ${CMAKE_C_FLAGS}) #============================================================================== # DEFINE THE INSTALL @@ -154,10 +153,8 @@ endif () include(CheckTypeSize) check_type_size("size_t" SIZEOF_SIZE_T) -MESSAGE("size_t ${SIZEOF_SIZE_T}") CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG) -MESSAGE("long long ${SIZEOF_LONG_LONG}") -if (SIZEOF_SIZE_T AND SIZEOF_LONG_LONG AND NOT ${SIZEOF_SIZE_T} EQUAL ${SIZEOF_LONG_LONG}) +if (NOT ${SIZEOF_SIZE_T} EQUAL ${SIZEOF_LONG_LONG}) message (FATAL_ERROR "size_t and long long must be the same size!") endif ()