mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-30 16:10:44 +08:00
We are now into the trial and error phase
trying to get travis to compile tst_fileinfo.
This commit is contained in:
parent
7be9506aac
commit
a5ffa8abca
4
cf.cmake
4
cf.cmake
@ -26,13 +26,13 @@ if test "x$NC4" = x ; then
|
||||
FLAGS="$FLAGS -DENABLE_NETCDF_4=false"
|
||||
fi
|
||||
FLAGS="$FLAGS -DENABLE_CONVERSION_WARNINGS=false"
|
||||
|
||||
FLAGS="$FLAGS -DENABLE_DAP_REMOTE_TESTS=true"
|
||||
FLAGS="$FLAGS -DENABLE_TESTS=true"
|
||||
|
||||
rm -fr build
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
cmake -GVisual\ Studio\ 14\ 2015 $FLAGS ${ZLIB} ${HDF5} ${CURL} ..
|
||||
cmake --build .
|
||||
#cmake --build .
|
||||
CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test
|
||||
|
@ -62,7 +62,6 @@ IF(ENABLE_TESTS)
|
||||
IF(USE_NETCDF4)
|
||||
ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
|
||||
TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
|
||||
add_sh_test(ncdump tst_fileinfo)
|
||||
ENDIF()
|
||||
|
||||
IF(MSVC)
|
||||
@ -87,15 +86,14 @@ IF(MSVC)
|
||||
SET_TARGET_PROPERTIES(tst_dimsizes PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
IF(USE_NETCDF4)
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET_TARGET_PROPERTIES(tst_fileinfo PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Base tests
|
||||
@ -115,6 +113,7 @@ ENDIF()
|
||||
add_sh_test(ncdump run_utf8_tests)
|
||||
IF(USE_NETCDF4)
|
||||
add_sh_test(ncdump run_utf8_nc4_tests)
|
||||
add_sh_test(ncdump tst_fileinfo)
|
||||
ENDIF(USE_NETCDF4)
|
||||
|
||||
add_sh_test(ncdump tst_nccopy3)
|
||||
@ -123,8 +122,7 @@ ENDIF()
|
||||
add_sh_test(ncdump tst_formatx3)
|
||||
add_sh_test(ncdump tst_bom)
|
||||
add_sh_test(ncdump tst_dimsizes)
|
||||
add_sh_test(ncdump tst_fileinfo)
|
||||
|
||||
|
||||
# The following test script invokes
|
||||
# gcc directly.
|
||||
IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
|
||||
|
Loading…
Reference in New Issue
Block a user