mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-23 16:59:54 +08:00
This commit is contained in:
parent
2294a705bf
commit
29be541497
@ -474,7 +474,7 @@ IF(NOT WIN32)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
||||
MESSAGE(netcdf_libraries: ${netcdf_library})
|
||||
# Create config.h file
|
||||
configure_file("${NetCDF_SOURCE_DIR}/cmake_config.h.in"
|
||||
"${NetCDF_BINARY_DIR}/config.h")
|
||||
@ -597,6 +597,26 @@ CONFIGURE_FILE(
|
||||
)
|
||||
#INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
|
||||
|
||||
# Create CMake package configuration files. With these, other packages using
|
||||
# cmake should be able to find netcdf using find_package and find_library.
|
||||
# This call is paired with one in liblib.
|
||||
install (EXPORT netcdf-targets
|
||||
DESTINATION share/cmake
|
||||
COMPONENT documentation)
|
||||
|
||||
configure_file (
|
||||
${NetCDF_SOURCE_DIR}/netcdf-config.cmake.in
|
||||
${NetCDF_BINARY_DIR}/netcdf-config.cmake @ONLY)
|
||||
|
||||
configure_file (
|
||||
${NetCDF_SOURCE_DIR}/netcdf-config-version.cmake.in
|
||||
${NetCDF_BINARY_DIR}/netcdf-config-version.cmake @ONLY)
|
||||
|
||||
install (FILES ${NetCDF_BINARY_DIR}/netcdf-config.cmake
|
||||
${NetCDF_BINARY_DIR}/netcdf-config-version.cmake
|
||||
DESTINATION share/cmake)
|
||||
|
||||
# End CMake package configuration files.
|
||||
#####
|
||||
# Various options for CPACK
|
||||
#####
|
||||
|
@ -44,7 +44,7 @@ set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
|
||||
SET (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY_ONCE 1)
|
||||
ctest_start("Continuous")
|
||||
|
||||
while (${CTEST_ELAPSED_TIME} LESS 36000)
|
||||
while (${CTEST_ELAPSED_TIME})
|
||||
set (START_TIME ${CTEST_ELAPSED_TIME})
|
||||
|
||||
ctest_update(RETURN_VALUE count)
|
||||
@ -61,5 +61,5 @@ while (${CTEST_ELAPSED_TIME} LESS 36000)
|
||||
message("Submitting")
|
||||
message("Analysis complete.")
|
||||
endif()
|
||||
ctest_sleep( ${START_TIME} 60 ${CTEST_ELAPSED_TIME})
|
||||
ctest_sleep( ${START_TIME} 300 ${CTEST_ELAPSED_TIME})
|
||||
endwhile()
|
||||
|
@ -66,8 +66,9 @@ SET_TARGET_PROPERTIES(netcdf PROPERTIES
|
||||
VERSION ${NetCDF_VERSION}
|
||||
SOVERSION ${NetCDF_VERSION_MAJOR})
|
||||
|
||||
INSTALL(TARGETS netcdf RUNTIME DESTINATION bin COMPONENT libraries
|
||||
INSTALL(TARGETS netcdf EXPORT netcdf-targets RUNTIME DESTINATION bin COMPONENT libraries
|
||||
LIBRARY DESTINATION lib COMPONENT libraries
|
||||
ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
ARCHIVE DESTINATION lib COMPONENT libraries
|
||||
)
|
||||
|
||||
SET(ALL_TLL_LIBS ${TLL_LIBS} PARENT_SCOPE)
|
||||
|
Loading…
Reference in New Issue
Block a user