Skip to content

Commit

Permalink
cmake2
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisHeimbigner committed Sep 29, 2024
1 parent bd83196 commit 8e83f9d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: NetCDF-C CMake CI - Windows

on: [push, pull_request, workflow_dispatch]
on: [ pull_request, workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

name: Run macOS-based netCDF Tests

on: [push,pull_request,workflow_dispatch]
on: [pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_win_cygwin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Run Cygwin-based tests

on: [push,pull_request,workflow_dispatch]
on: [pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_win_mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
CPPFLAGS: "-D_BSD_SOURCE"
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

on: [push,pull_request,workflow_dispatch]
on: [pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ endif()
# is always used as a surrogate for the default
# plugin path. If it was not defined by the user,
# then set it internally.
if(NOT DEFINED HDF5_PLUGIN_PATH OR ${HDF5_PLUGIN_PATH} STREQUAL "")
if((NOT DEFINED HDF5_PLUGIN_PATH) OR ("${HDF5_PLUGIN_PATH}" STREQUAL ""))
if(ISMSVC OR ISMINGW)
string(REPLACE "\\" "/" AUP "$ENV{"ALLUSERSPROFILE"}")
set(HDF5_PLUGIN_PATH "${AUP}/hdfd5/lib/plugin")
Expand Down

0 comments on commit 8e83f9d

Please sign in to comment.