Skip to content

Commit

Permalink
cleanup, update pnetcdf lib
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b committed Jul 27, 2020
1 parent 79b4b02 commit 11a9ad5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ()

Expand Down

0 comments on commit 11a9ad5

Please sign in to comment.