VFD SWMR: Normalization with develop (#1078)

Brings many changes from develop, particularly VOL changes for async
This commit is contained in:
Dana Robinson
2021-10-05 22:37:12 -07:00
committed by GitHub
parent 5592111747
commit a45b73e427
381 changed files with 19095 additions and 10324 deletions

View File

@@ -1,17 +1,8 @@
# Distributed under the OSI-approved BSD 3-Clause License. See https://cmake.org/licensing for details.
#[=======================================================================[.rst:
UseJavaClassFilelist
--------------------
This script create a list of compiled Java class files to be added to
a jar file. This avoids including cmake files which get created in
the binary directory.
#]=======================================================================]
# This script creates a list of compiled Java class files to be added to
# a jar file. This avoids including cmake files which get created in
# the binary directory.
if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
@@ -23,7 +14,7 @@ if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
file(GLOB_RECURSE _JAVA_GLOBBED_TMP_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${JAR_CLASS_PREFIX}/*.class")
if (_JAVA_GLOBBED_TMP_FILES)
list (APPEND _JAVA_GLOBBED_FILES ${_JAVA_GLOBBED_TMP_FILES})
list(APPEND _JAVA_GLOBBED_FILES ${_JAVA_GLOBBED_TMP_FILES})
endif ()
endforeach()
else()