mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-12-15 07:40:23 +08:00
Merge pull request #602 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '863c9b2ea557838006bfb320a3cef56e3e34be3d': HDFFV-10254 fix spelling HDFFV-10254 release note for change to use macro for copy files HDFF-10254 - Copy test files with macro to avoid POST_BUILD failure Correct name of VAR Synch with CMake master
This commit is contained in:
Allen Byrne
commit
d2b5cd08ff
@ -1,16 +1,5 @@
|
||||
# Distributed under the OSI-approved BSD 3-Clause License. See https://cmake.org/licensing for details.
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2013-2014 Kitware, Inc.
|
||||
#
|
||||
# Distributed under the OSI-approved BSD License (the "License");
|
||||
# see accompanying file Copyright.txt for details.
|
||||
#
|
||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
# See the License for more information.
|
||||
#=============================================================================
|
||||
# (To distribute this file outside of CMake, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
# Do not include this module directly from code outside CMake!
|
||||
set(_JAVA_HOME "")
|
||||
|
||||
@ -345,5 +345,3 @@ set(JNI_INCLUDE_DIRS
|
||||
${JAVA_AWT_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
message ("JNI_LIBRARIES=${JNI_LIBRARIES}")
|
||||
message ("JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
|
||||
|
||||
@ -66,7 +66,7 @@ endif()
|
||||
if(NOT DEFINED CTEST_BUILD_NAME)
|
||||
set(CTEST_BUILD_NAME "examples")
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
|
||||
|
||||
#TAR_SOURCE - name of tarfile
|
||||
#if(NOT DEFINED TAR_SOURCE)
|
||||
@ -88,9 +88,9 @@ else()
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
endif()
|
||||
if(${CDASH_LOCAL})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
|
||||
|
||||
###############################################################################################################
|
||||
# For any comments please contact cdashhelp@hdfgroup.org
|
||||
|
||||
@ -243,21 +243,23 @@
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# install_jar_exports(TARGETS jar1 [jar2 ...]
|
||||
# FILE export_filename
|
||||
# DESTINATION destination [COMPONENT component])
|
||||
# install_jar_exports(TARGETS jars...
|
||||
# [NAMESPACE <namespace>]
|
||||
# FILE <filename>
|
||||
# DESTINATION <dir> [COMPONENT <component>])
|
||||
#
|
||||
# This command installs a target export file export_filename for the named jar
|
||||
# targets to the given DESTINATION. Its function is similar to that of
|
||||
# install(EXPORTS).
|
||||
# This command installs a target export file ``<filename>`` for the named jar
|
||||
# targets to the given ``DESTINATION``. Its function is similar to that of
|
||||
# :command:`install(EXPORTS ...)`.
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# export_jars(TARGETS jar1 [jar2 ...]
|
||||
# FILE export_filename)
|
||||
# export_jars(TARGETS jars...
|
||||
# [NAMESPACE <namespace>]
|
||||
# FILE <filename>)
|
||||
#
|
||||
# This command writes a target export file export_filename for the named jar
|
||||
# targets. Its function is similar to that of export().
|
||||
# This command writes a target export file ``<filename>`` for the named jar
|
||||
# targets. Its function is similar to that of :command:`export(...)`.
|
||||
#
|
||||
# ::
|
||||
#
|
||||
@ -425,10 +427,12 @@ endfunction()
|
||||
function(__java_export_jar VAR TARGET PATH)
|
||||
get_target_property(_jarpath ${TARGET} JAR_FILE)
|
||||
get_filename_component(_jarname ${_jarpath} NAME)
|
||||
set(_target "${_jar_NAMESPACE}${TARGET}")
|
||||
__java_lcat(${VAR}
|
||||
"# Create imported target ${TARGET}"
|
||||
"add_custom_target(${TARGET})"
|
||||
"set_target_properties(${TARGET} PROPERTIES"
|
||||
"# Create imported target ${_target}"
|
||||
"add_library(${_target} IMPORTED STATIC)"
|
||||
"set_target_properties(${_target} PROPERTIES"
|
||||
" IMPORTED_LOCATION \"${PATH}/${_jarname}\""
|
||||
" JAR_FILE \"${PATH}/${_jarname}\")"
|
||||
""
|
||||
)
|
||||
@ -1402,7 +1406,7 @@ function(export_jars)
|
||||
# Parse and validate arguments
|
||||
cmake_parse_arguments(_export_jars
|
||||
""
|
||||
"FILE"
|
||||
"FILE;NAMESPACE"
|
||||
"TARGETS"
|
||||
${ARGN}
|
||||
)
|
||||
@ -1412,6 +1416,7 @@ function(export_jars)
|
||||
if (NOT _export_jars_TARGETS)
|
||||
message(SEND_ERROR "export_jars: TARGETS must be specified.")
|
||||
endif()
|
||||
set(_jar_NAMESPACE "${_export_jars_NAMESPACE}")
|
||||
|
||||
# Set content of generated exports file
|
||||
string(REPLACE ";" " " __targets__ "${_export_jars_TARGETS}")
|
||||
@ -1434,7 +1439,7 @@ function(install_jar_exports)
|
||||
# Parse and validate arguments
|
||||
cmake_parse_arguments(_install_jar_exports
|
||||
""
|
||||
"FILE;DESTINATION;COMPONENT"
|
||||
"FILE;DESTINATION;COMPONENT;NAMESPACE"
|
||||
"TARGETS"
|
||||
${ARGN}
|
||||
)
|
||||
@ -1447,6 +1452,7 @@ function(install_jar_exports)
|
||||
if (NOT _install_jar_exports_TARGETS)
|
||||
message(SEND_ERROR "install_jar_exports: TARGETS must be specified.")
|
||||
endif()
|
||||
set(_jar_NAMESPACE "${_install_jar_exports_NAMESPACE}")
|
||||
|
||||
if (_install_jar_exports_COMPONENT)
|
||||
set (_COMPONENT COMPONENT ${_install_jar_exports_COMPONENT})
|
||||
|
||||
@ -56,18 +56,11 @@ set (H5WATCH_TEST_FILES
|
||||
|
||||
# make test dir
|
||||
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
|
||||
add_custom_target(h5watch-files ALL COMMENT "Copying files needed by h5watch tests")
|
||||
|
||||
foreach (h5watch_file ${H5WATCH_TEST_FILES})
|
||||
set (dest "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}")
|
||||
#message (STATUS " Copying ${h5watch_file}")
|
||||
add_custom_command (
|
||||
TARGET h5watch-files
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS -E copy_if_different ${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file} ${dest}
|
||||
)
|
||||
HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
|
||||
endforeach ()
|
||||
add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list})
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
|
||||
@ -205,6 +205,15 @@ Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
|
||||
(HDFFV-10248, DER, 2017/07/05)
|
||||
|
||||
- cmake
|
||||
|
||||
Too many commands for POST_BUILD step caused command line to be
|
||||
too big on windows.
|
||||
|
||||
Changed foreach of copy command to use a custom command with the
|
||||
use of the HDFTEST_COPY_FILE macro.
|
||||
|
||||
(ADB - 2017/07/12, HDFFV-10254)
|
||||
|
||||
Performance
|
||||
-------------
|
||||
|
||||
Loading…
Reference in New Issue
Block a user