mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert out all subproject changes; including dependencies used for test scripts is painful. May attempt in the future.

Browse Source
This commit is contained in:
Ward Fisher 2013-07-24 17:31:12 +00:00
parent 9b2760779c
commit 4a0310c01e
7 changed files with 20 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -162,7 +162,6 @@ MACRO(build_bin_test F)
PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
)
ENDIF()
SET_PROPERTY(TARGET ${F} PROPERTY LABELS invoked_by_scripts)
ENDMACRO()
# Binary tests which are used by a script looking for a specific name.
@ -172,7 +171,6 @@ MACRO(add_bin_test_no_prefix F)
IF(MSVC)
SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
ENDIF()
ENDMACRO()
# Binary tests which are used by a script looking for a specific name.
@ -194,7 +192,6 @@ MACRO(add_bin_test prefix F)
)
ENDIF()
ADD_TEST(${prefix}_${F} ${EXECUTABLE_OUTPUT_PATH}/${prefix}_${F})
SET_PROPERTY(TEST ${prefix}_${F} PROPERTY LABELS ${prefix})
IF(MSVC)
SET_PROPERTY(TEST ${prefix}_${F} PROPERTY FOLDER "tests/")
ENDIF()
@ -225,7 +222,6 @@ ENDMACRO()
MACRO(add_sh_test prefix F)
IF(NOT MSVC)
ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh")
SET_PROPERTY(TEST ${prefix}_${F} PROPERTY LABELS ${prefix})
ENDIF()
ENDMACRO()

3
CTestConfig.cmake
View File

@ -1,7 +1,4 @@
# CTest/CDash configuration
SET(CTEST_PROJECT_SUBPROJECTS netcdf ncgen ncdump nccopy nc_test)
IF(USE_REMOTE_CDASH)
set(CTEST_PROJECT_NAME "NetCDF-C")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")

19
Project.xml
View File

@ -1,19 +0,0 @@
<Project name="WinNETCDF">
<SubProject name="netcdf">
</SubProject>
<SubProject name="invoked_by_scripts">
<Dependency name="netcdf"/>
</SubProject>
<SubProject name="ncgen">
<Dependency name="invoked_by_scripts">
</SubProject>
<SubProject name="ncdump">
<Dependency name="invoked_by_scripts">
</SubProject>
<SubProject name="nccopy">
<Dependency name="invoked_by_scripts">
</SubProject>
<SubProject name="nc_test">
<Dependency name="invoked_by_scripts">
</SubProject>
</Project>

3
liblib/CMakeLists.txt
View File

@ -64,10 +64,7 @@ ENDIF()
IF(ENABLE_PNETCDF AND PNETCDF)
SET(TLL_LIBS ${TLL_LIBS} ${PNETCDF})
ENDIF()
TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
SET_PROPERTY(TARGET netcdf PROPERTY LABELS netcdf)
IF(MSVC)
SET_TARGET_PROPERTIES(netcdf PROPERTIES

34
nc_test/CMakeLists.txt
View File

@ -8,6 +8,8 @@ ENDFOREACH()
SET (nc_test_SRC nc_test.c error.c test_get.c test_put.c test_read.c test_write.c util.c)
ADD_EXECUTABLE(nc_test ${nc_test_SRC})
TARGET_LINK_LIBRARIES(nc_test netcdf)
# Some extra tests
SET(TESTS t_nc tst_small tst_misc tst_norm tst_names tst_nofill tst_nofill2 tst_nofill3)
@ -33,39 +35,27 @@ ENDIF()
# Build executables required for the shell scripts.
FOREACH(BINFILE ${TESTFILES})
build_bin_test(${BINFILE})
build_bin_test(${BINFILE})
ENDFOREACH()
# Process single-file test files.
FOREACH(CTEST ${TESTS})
add_bin_test(nc_test ${CTEST})
SET_PROPERTY(TEST nc_test_${CTEST} PROPERTY LABELS nc_test)
ENDFOREACH()
#SET_PROPERTY(TEST nc_test PROPERTY LABELS nc_test)
ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
IF(BUILD_DISKLESS)
add_sh_test(nc_test run_diskless)
SET_PROPERTY(TEST nc_test_run_diskless PROPERTY LABELS nc_test)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
SET_PROPERTY(TEST nc_test_run_mmap PROPERTY LABELS nc_test)
ENDIF()
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2)
SET_PROPERTY(TEST nc_test_run_diskless2 PROPERTY LABELS nc_test)
ENDIF()
add_sh_test(nc_test run_diskless)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
ENDIF()
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2.sh)
ENDIF()
ENDIF()
ADD_EXECUTABLE(nc_test ${nc_test_SRC})
TARGET_LINK_LIBRARIES(nc_test netcdf)
ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
SET_PROPERTY(TEST nc_test PROPERTY LABELS nc_test)
# Copy some test files from current source dir to out-of-tree build dir.
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)

5
ncdump/CMakeLists.txt
View File

@ -36,10 +36,6 @@ ADD_EXECUTABLE(nccopy ${nccopy_FILES})
TARGET_LINK_LIBRARIES(ncdump netcdf ${ALL_TLL_LIBS})
TARGET_LINK_LIBRARIES(nccopy netcdf ${ALL_TLL_LIBS})
SET_PROPERTY(TARGET ncdump PROPERTY LABELS ncdump)
SET_PROPERTY(TARGET nccopy PROPERTY LABELS nccopy)
IF(ENABLE_TESTS)
ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c)
TARGET_LINK_LIBRARIES(rewrite-scalar netcdf)
@ -142,7 +138,6 @@ INSTALL(TARGETS nccopy DESTINATION bin COMPONENT utilities)
SET(MAN_FILES nccopy.1 ncdump.1)
FILE(GLOB COPY_FILES ${CMAKE_BINARY_DIR}/ncgen/*.nc ${CMAKE_BINARY_DIR}/nc_test4/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.ncml ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/*.1)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)

19
ncgen/CMakeLists.txt
View File

@ -10,9 +10,6 @@ ENDIF()
ADD_EXECUTABLE(ncgen ${ncgen_FILES})
TARGET_LINK_LIBRARIES(ncgen netcdf ${ALL_TLL_LIBS})
SET_PROPERTY(TARGET ncgen PROPERTY LABELS ncgen)
INSTALL(TARGETS ncgen DESTINATION bin COMPONENT utilities)
@ -22,14 +19,14 @@ FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
# Stuff to build if tests are enabled.
IF(ENABLE_TESTS)
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
add_sh_test(ncgen run_tests)
IF(USE_NETCDF4)
add_sh_test(ncgen run_nc4_tests)
ENDIF()
SET_PROPERTY(TEST ncgen_run_tests PROPERTY LABELS ncgen)
SET_PROPERTY(TEST ncgen_run_nc4_tests PROPERTY LABELS ncgen)
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
add_sh_test(ncgen run_tests)
#ADD_TEST(run_ncgen_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh)
IF(USE_NETCDF4)
#ADD_TEST(run_ncgen_nc4_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_nc4_tests.sh)
add_sh_test(ncgen run_nc4_tests)
ENDIF()
ENDIF()
SET(MAN_FILES ncgen.1)