From 5e4cbd2feca0a30033a3047882f611a02132a3da Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 5 Jan 2016 22:26:20 -0700 Subject: [PATCH] Forgot to check cmake build --- cf.cmake | 16 ++++++++++------ ncdump/CMakeLists.txt | 12 ++++++++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cf.cmake b/cf.cmake index c8e2d48df..c78b1d1e0 100644 --- a/cf.cmake +++ b/cf.cmake @@ -2,23 +2,27 @@ rm -fr build mkdir build cd build -export CC=mpicc +#export CC=mpicc +export CC=gcc for p in /usr/local/lib /usr/lib ; do -if test -z "$ZP" -a -f $p/libz.so ; then ZP=$p; fi -if test -z "$HP" -a -f $p/libhdf5.so ; then HP=$p; fi -if test -z "$CP" -a -f $p/libcurl.so ; then CP=$p; fi +if test -f $p/libz.so ; then ZP=$p; fi +if test -f $p/libhdf5.so ; then HP=$p; fi +if test -f $p/libcurl.so ; then CP=$p; fi done - ZLIB="-DZLIB_LIBRARY=${ZP}/libz.so -DZLIB_INCLUDE_DIR=${ZP}/include -DZLIB_INCLUDE_DIRS=${ZP}/include" HDF5="-DHDF5_LIB=${HP}/libhdf5.so -DHDF5_HL_LIB=${HP}/libhdf5_hl.so -DHDF5_INCLUDE_DIR=${HP}/include" CURL="-DCURL_LIBRARY=${CP}/libcurl.so -DCURL_INCLUDE_DIR=${CP}/include -DCURL_INCLUDE_DIRS=${CP}/include" + +FLAGS="$FLAGS -DENABLE_DAP=false" +FLAGS="$FLAGS -DENABLE_NETCDF_4=false" + FLAGS="$FLAGS -DCMAKE_INSTALL_PREFIX=/usr/local" #FLAGS="-DCMAKE_PREFIX_PATH=$PPATH" #FLAGS="$FLAGS -DCMAKE_PREFIX_PATH=$PPATH" FLAGS="$FLAGS -DENABLE_DAP_REMOTE_TESTS=true" -FLAGS="$FLAGS -DENABLE_DAP_AUTH_TESTS=true" +#FLAGS="$FLAGS -DENABLE_DAP_AUTH_TESTS=true" cmake $FLAGS ${ZLIB} ${HDF5} ${CURL} .. cmake --build . diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index 41dbc12ac..8eb85782d 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -54,8 +54,10 @@ ENDIF() IF(ENABLE_TESTS) ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c) ADD_EXECUTABLE(bom bom.c) + ADD_EXECUTABLE(tst_dimsizes tst_dimsizes.c) TARGET_LINK_LIBRARIES(rewrite-scalar netcdf) TARGET_LINK_LIBRARIES(bom netcdf) + TARGET_LINK_LIBRARIES(tst_dimsizes netcdf) IF(MSVC) SET_TARGET_PROPERTIES(rewrite-scalar PROPERTIES RUNTIME_OUTPUT_DIRECTORY @@ -71,6 +73,13 @@ IF(MSVC) ${CMAKE_CURRENT_BINARY_DIR}) SET_TARGET_PROPERTIES(bom PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}) + + SET_TARGET_PROPERTIES(tst_dimsizes PROPERTIES RUNTIME_OUTPUT_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}) + SET_TARGET_PROPERTIES(tst_dimsizes PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG + ${CMAKE_CURRENT_BINARY_DIR}) + SET_TARGET_PROPERTIES(tst_dimsizes PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE + ${CMAKE_CURRENT_BINARY_DIR}) ENDIF() # Base tests @@ -96,10 +105,9 @@ ENDIF() add_sh_test(ncdump tst_nccopy3) add_sh_test(ncdump tst_charfill) - - add_sh_test(ncdump tst_formatx3) add_sh_test(ncdump tst_bom) + add_bin_test(ncdump tst_dimsizes) # The following test script invokes # gcc directly.