Skip to content

Commit 2f228e8

Browse files
committed
Update CMake in the filters
1 parent d3486ba commit 2f228e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+742
-454
lines changed

.github/workflows/daily-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
9696
AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
9797
AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
98-
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
98+
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
9999

100100
call-workflow-release:
101101
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest]
@@ -108,7 +108,7 @@ jobs:
108108
file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }}
109109
use_tag: snapshot
110110
use_environ: snapshots
111-
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
111+
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
112112

113113
call-workflow-remove:
114114
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-release]
@@ -119,7 +119,7 @@ jobs:
119119
file_base: ${{ needs.get-old-names.outputs.plugin-name }}
120120
use_tag: snapshot
121121
use_environ: snapshots
122-
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
122+
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
123123

124124
call-workflow-versions:
125125
uses: ./.github/workflows/check-releases.yml

.github/workflows/publish-branch.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,25 @@ on:
1212
description: 'hdf5 plugins target bucket directory'
1313
type: string
1414
required: true
15-
permissions:
16-
contents: read
15+
16+
permissions:
17+
contents: read
1718

1819
jobs:
1920
publish-tag:
2021
runs-on: ubuntu-latest
2122
steps:
2223
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2324
- name: Get Sources
24-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
2526
with:
2627
fetch-depth: 0
2728
ref: '${{ github.head_ref || github.ref_name }}'
2829

2930
- name: List files for the space
3031
run: |
3132
ls -l ${{ github.workspace }}
32-
ls ${{ github.workspace }}/HDF4
33+
ls ${{ github.workspace }}/HDF5_plugins
3334
3435
- name: Setup AWS CLI
3536
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/publish-release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ on:
1212
description: 'HDF5 Plugins target bucket directory'
1313
type: string
1414
required: true
15-
permissions:
16-
contents: read
15+
16+
permissions:
17+
contents: read
1718

1819
jobs:
1920
publish-tag:
2021
runs-on: ubuntu-latest
2122
steps:
2223
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2324
- name: Get Sources
24-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
2526
with:
2627
fetch-depth: 0
2728
ref: '${{ github.head_ref || github.ref_name }}'

.github/workflows/release-files.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,19 @@ jobs:
117117
- name: Get published binary (Linux)
118118
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
119119
with:
120-
name: tgz-ubuntu-2204_gcc-binary
120+
name: tgz-ubuntu-2404_gcc-binary
121121
path: ${{ github.workspace }}
122122

123123
- name: Get published deb binary (Linux)
124124
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
125125
with:
126-
name: deb-ubuntu-2204_gcc-binary
126+
name: deb-ubuntu-2404_gcc-binary
127127
path: ${{ github.workspace }}
128128

129129
- name: Get published rpm binary (Linux)
130130
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
131131
with:
132-
name: rpm-ubuntu-2204_gcc-binary
132+
name: rpm-ubuntu-2404_gcc-binary
133133
path: ${{ github.workspace }}
134134

135135
- name: Create sha256 sums for files
@@ -138,9 +138,9 @@ jobs:
138138
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
139139
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
140140
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
141-
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
142-
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
143-
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
141+
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
142+
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.deb >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
143+
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.rpm >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
144144
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
145145
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
146146
@@ -151,7 +151,7 @@ jobs:
151151
- name: PreRelease tag
152152
id: create_prerelease
153153
if: ${{ (inputs.use_environ == 'snapshots') }}
154-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
154+
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
155155
with:
156156
tag_name: "${{ inputs.use_tag }}"
157157
prerelease: true
@@ -161,9 +161,9 @@ jobs:
161161
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
162162
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
163163
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
164-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
165-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
166-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
164+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.tar.gz
165+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.deb
166+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.rpm
167167
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
168168
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
169169
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
@@ -172,7 +172,7 @@ jobs:
172172
- name: Release tag
173173
id: create_release
174174
if: ${{ (inputs.use_environ == 'release') }}
175-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
175+
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
176176
with:
177177
tag_name: "${{ inputs.use_tag }}"
178178
prerelease: false
@@ -181,9 +181,9 @@ jobs:
181181
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
182182
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
183183
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
184-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
185-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
186-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
184+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.tar.gz
185+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.deb
186+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.rpm
187187
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
188188
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
189189
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt

.github/workflows/remove-files.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ jobs:
4545
token: ${{ github.token }}
4646
tag: "${{ inputs.use_tag }}"
4747
assets: |
48+
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
4849
${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
4950
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
5051
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
5152
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
52-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
53-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
54-
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
53+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.tar.gz
54+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.deb
55+
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.rpm
5556
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
5657
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
57-
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
5858

BLOSC/config/cmake/CTestScript.cmake

Lines changed: 58 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
# If you do not have access to either file, you may request a copy from
1010
# help@hdfgroup.org.
1111
#
12-
cmake_minimum_required (VERSION 3.12)
12+
cmake_minimum_required (VERSION 3.18)
1313
########################################################
14-
# This dashboard is maintained by The HDF Group
15-
# For any comments please contact cdashhelp@hdfgroup.org
14+
# For any comments please contact help@hdfgroup.org
1615
#
1716
########################################################
1817
# -----------------------------------------------------------
@@ -23,23 +22,22 @@ if (NOT SITE_OS_NAME)
2322
## -- set hostname
2423
## --------------------------
2524
find_program (HOSTNAME_CMD NAMES hostname)
26-
exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
25+
execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
2726
set (CTEST_SITE "${HOSTNAME}${CTEST_SITE_EXT}")
2827
find_program (UNAME NAMES uname)
2928
macro (getuname name flag)
30-
exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
29+
execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}" OUTPUT_STRIP_TRAILING_WHITESPACE)
3130
endmacro ()
3231

3332
getuname (osname -s)
33+
string(STRIP ${osname} osname)
3434
getuname (osrel -r)
35+
string(STRIP ${osrel} osrel)
3536
getuname (cpu -m)
37+
string(STRIP ${cpu} cpu)
3638
message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
3739

3840
set (CTEST_BUILD_NAME "${osname}-${osrel}-${cpu}")
39-
if (SITE_BUILDNAME_SUFFIX)
40-
set (CTEST_BUILD_NAME "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
41-
endif ()
42-
set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS}")
4341
else ()
4442
## machine name provided
4543
## --------------------------
@@ -48,14 +46,25 @@ else ()
4846
else ()
4947
set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")
5048
endif ()
51-
if (SITE_BUILDNAME_SUFFIX)
52-
set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${SITE_BUILDNAME_SUFFIX}")
53-
endif ()
54-
set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
49+
endif ()
50+
if (SITE_BUILDNAME_SUFFIX)
51+
set (CTEST_BUILD_NAME "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
52+
endif ()
53+
set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
54+
55+
# Launchers work only with Makefile and Ninja generators.
56+
if (NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST)
57+
set (CTEST_USE_LAUNCHERS 0)
58+
set (ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0)
59+
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF")
60+
else ()
61+
set (CTEST_USE_LAUNCHERS 1)
62+
set (ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
63+
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON")
5564
endif ()
5665

5766
#-----------------------------------------------------------------------------
58-
# MAC machines need special option
67+
# MacOS machines need special options
5968
#-----------------------------------------------------------------------------
6069
if (APPLE)
6170
# Compiler choice
@@ -72,10 +81,10 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
7281
## Clear the build directory
7382
## --------------------------
7483
set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
75-
if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
76-
ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
77-
else ()
84+
if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")
7885
file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
86+
else ()
87+
ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
7988
endif ()
8089

8190
# Use multiple CPU cores to build
@@ -117,22 +126,24 @@ endforeach ()
117126
#-----------------------------------------------------------------------------
118127
# Initialize the CTEST commands
119128
#------------------------------
120-
set (CTEST_CONFIGURE_TOOLSET "")
121-
if(CMAKE_GENERATOR_TOOLSET)
122-
set (CTEST_CONFIGURE_TOOLSET "-T${CMAKE_GENERATOR_TOOLSET}")
129+
if (CMAKE_GENERATOR_TOOLSET)
130+
set (CTEST_CONFIGURE_TOOLSET "\"-T${CMAKE_GENERATOR_TOOLSET}\"")
131+
else ()
132+
set (CTEST_CONFIGURE_TOOLSET)
123133
endif()
124-
set (CTEST_CONFIGURE_ARCHITECTURE "")
125-
if(CMAKE_GENERATOR_ARCHITECTURE)
126-
set (CTEST_CONFIGURE_ARCHITECTURE "-A${CMAKE_GENERATOR_ARCHITECTURE}")
134+
if (CMAKE_GENERATOR_ARCHITECTURE)
135+
set (CTEST_CONFIGURE_ARCHITECTURE "\"-A${CMAKE_GENERATOR_ARCHITECTURE}\"")
136+
else ()
137+
set (CTEST_CONFIGURE_ARCHITECTURE)
127138
endif()
128139
set (CTEST_CONFIGURE_COMMAND
129-
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
140+
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" ${CTEST_CONFIGURE_ARCHITECTURE} ${CTEST_CONFIGURE_TOOLSET} \"${CTEST_SOURCE_DIRECTORY}\""
130141
)
131142
#-----------------------------------------------------------------------------
132143

133144
#-----------------------------------------------------------------------------
134145
## -- set output to english
135-
set ($ENV{LC_MESSAGES} "en_EN")
146+
set (ENV{LC_MESSAGES} "en_EN")
136147

137148
# Print summary information.
138149
foreach (v
@@ -142,6 +153,8 @@ foreach (v
142153
CTEST_BINARY_DIRECTORY
143154
CTEST_CMAKE_GENERATOR
144155
CTEST_CONFIGURATION_TYPE
156+
CTEST_GIT_COMMAND
157+
CTEST_CHECKOUT_COMMAND
145158
CTEST_CONFIGURE_COMMAND
146159
CTEST_SCRIPT_DIRECTORY
147160
CTEST_USE_LAUNCHERS
@@ -159,11 +172,20 @@ if (NOT DEFINED MODEL)
159172
set (MODEL "Experimental")
160173
endif ()
161174

175+
set (ENV{CI_SITE_NAME} ${CTEST_SITE})
176+
set (ENV{CI_BUILD_NAME} ${CTEST_BUILD_NAME})
177+
set (ENV{CI_MODEL} ${MODEL})
178+
162179
#-----------------------------------------------------------------------------
163180
## NORMAL process
181+
## -- LOCAL_UPDATE updates the source folder from svn
164182
## -- LOCAL_SUBMIT reports to CDash server
183+
## -- LOCAL_SKIP_TEST skips the test process (only builds)
165184
## --------------------------
166-
ctest_start (${MODEL} TRACK ${MODEL})
185+
ctest_start (${MODEL} GROUP ${MODEL})
186+
if (LOCAL_UPDATE)
187+
ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
188+
endif ()
167189
configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
168190
ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
169191
ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
@@ -182,11 +204,16 @@ endif ()
182204
file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
183205
endif ()
184206

185-
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
186-
if (LOCAL_SUBMIT)
187-
ctest_submit (PARTS Test)
207+
if (NOT LOCAL_SKIP_TEST)
208+
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
209+
if (LOCAL_SUBMIT)
210+
ctest_submit (PARTS Test)
211+
endif ()
212+
if (${res} LESS 0 OR ${res} GREATER 0)
213+
file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
214+
endif ()
188215
endif ()
189-
if (${res} LESS 0 OR ${res} GREATER 0)
190-
file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
216+
if (LOCAL_SUBMIT)
217+
ctest_submit (PARTS Done)
191218
endif ()
192219
#-----------------------------------------------------------------------------

BLOSC/config/cmake/H5PL_Examples.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ endif()
118118
#
119119
###############################################################################################################
120120
if(WIN32)
121-
include(${CTEST_DASHBOARD_ROOT}\\HDFoptions.cmake)
121+
include(${CTEST_DASHBOARD_ROOT}\\HDFPLoptions.cmake)
122122
include(${CTEST_DASHBOARD_ROOT}\\CTestScript.cmake)
123123
else()
124-
include(${CTEST_DASHBOARD_ROOT}/HDFoptions.cmake)
124+
include(${CTEST_DASHBOARD_ROOT}/HDFPLoptions.cmake)
125125
include(${CTEST_DASHBOARD_ROOT}/CTestScript.cmake)
126126
endif()
127127
##############################################################################################################

BLOSC/config/cmake/HDFPluginMacros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ macro (INSTALL_SUPPORT varname)
338338
FILES
339339
${${PLUGIN_PACKAGE_NAME}_BINARY_DIR}/H5PL_Examples.cmake
340340
${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}/CTestScript.cmake
341-
${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}/HDFoptions.cmake
341+
${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}/HDFPLoptions.cmake
342342
DESTINATION ${${PLUGIN_PACKAGE_NAME}_INSTALL_DATA_DIR}
343343
COMPONENT hdfdocuments
344344
)

BLOSC/config/cmake/SignPackageFiles.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ elseif (CPACK_GENERATOR MATCHES "WIX" OR CPACK_GENERATOR MATCHES "NSIS")
88
set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/libraries")
99
elseif (CPACK_GENERATOR MATCHES "ZIP")
1010
set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
11+
elseif (CPACK_GENERATOR MATCHES "DragNDrop")
12+
set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/ALL_IN_ONE/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
1113
else ()
1214
set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
1315
endif ()

0 commit comments

Comments
 (0)