Skip to content

Commit 3c73393

Browse files
committed
change hdf5_home_win
1 parent 916bfe4 commit 3c73393

2 files changed

Lines changed: 15 additions & 16 deletions

File tree

.travis.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env:
1010
CLANG_VERSION="export CC=gcc-7 && export CXX=g++-7";
1111
elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
1212
echo "Windoes compiler?";
13-
HDF5_HOME_WIN="C:/Program\\ Files/HDF_Group/HDF5/1.10.5"
1413
else
1514
GCC_VERSION="export CC=gcc-7 && export CXX=g++-7";
1615
fi
@@ -76,32 +75,32 @@ before_install:
7675
powershell "Start-Process msiexec.exe -Wait -ArgumentList '/I C:\\Users\\travis\\build\\HDF-NI\\hdf5.node\\hdf\\HDF5-1.10.5-win64.msi /quiet'" ;
7776
fi
7877

79-
install:
80-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
81-
echo ${HDF5_HOME};
82-
npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC};
83-
elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
84-
echo "Windoes compiler?";
85-
npm install --longlong_type=LONGLONG53BITS --hdf5_home_win=${HDF5_HOME_WIN};
86-
else
87-
export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial;
88-
eval "${GCC_VERSION}" ;
89-
npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX};
90-
fi
91-
9278
# install:
9379
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
9480
# echo ${HDF5_HOME};
9581
# npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC};
9682
# elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
9783
# echo "Windoes compiler?";
98-
# npm install --longlong_type=LONGLONG53BITS;
84+
# npm install --longlong_type=LONGLONG53BITS --hdf5_home_win=${HDF5_HOME_WIN};
9985
# else
10086
# export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial;
10187
# eval "${GCC_VERSION}" ;
10288
# npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX};
10389
# fi
10490

91+
install:
92+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
93+
echo ${HDF5_HOME};
94+
npm install --longlong_type=LONGLONG53BITS --hdf5_home_mac=${HDF5_HOME_MAC};
95+
elif [[ "$TRAVIS_OS_NAME" == "windows" ]] ; then
96+
echo "Windoes compiler?";
97+
npm install --longlong_type=LONGLONG53BITS;
98+
else
99+
export HDF5_HOME_LINUX=/usr/lib/x86_64-linux-gnu/hdf5/serial;
100+
eval "${GCC_VERSION}" ;
101+
npm install --longlong_type=LONGLONG53BITS --hdf5_home_linux=${HDF5_HOME_LINUX};
102+
fi
103+
105104

106105
before-scripte:
107106
- export PATH=`pwd`/node_modules/.bin:${PATH}

binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"variables": {
33
"hdf5_home_linux%": "/usr/local",
4-
"hdf5_home_win%": "C:/Software/hdf5",
4+
"hdf5_home_win%": "C:/Program Files/HDF_Group/HDF5/1.10.5",
55
"hdf5_home_mac%": "/usr/local",
66
"link_type%": "shared",
77
"debug_mode%": "",

0 commit comments

Comments
 (0)