Skip to content

Commit 7c777ca

Browse files
philippeVerneyphilippeVerney
committed
Test CI
1 parent 095c779 commit 7c777ca

2 files changed

Lines changed: 37 additions & 35 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
shell: pwsh
1313
run: |
1414
# Download and extract
15-
curl -L "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
15+
curl -L "https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
1616
cd ${{ runner.temp }}
1717
tar -xzf zlib.tar.gz
1818
# Detect extracted folder (handles zlib-1.3.1 or future versions)
@@ -22,16 +22,7 @@ jobs:
2222
mkdir zlib-build
2323
cd zlib-build
2424
# Configure and install
25-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install $zlibSrc.FullName
26-
cmake --build . --config Release -j2
27-
cmake --build . --config Release --target INSTALL
28-
- name: Minizip static lib install
29-
run: |
30-
git clone https://github.com/F2I-Consulting/Minizip.git ${{ runner.temp }}/Minizip
31-
cd ${{ runner.temp }}
32-
mkdir minizip-build
33-
cd minizip-build
34-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBUILD_SHARED_LIBS=FALSE -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/minizip-install ${{ runner.temp }}/Minizip
25+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DZLIB_BUILD_MINIZIP=ON -DZLIB_BUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install $zlibSrc.FullName
3526
cmake --build . --config Release -j2
3627
cmake --build . --config Release --target INSTALL
3728
- name: HDF5 install
@@ -41,7 +32,7 @@ jobs:
4132
Expand-Archive ${{ runner.temp }}\hdf5-2.0.0.zip -DestinationPath ${{ runner.temp }}
4233
mkdir hdf5-build
4334
cd hdf5-build
44-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON -DZLIB_ROOT:PATH=${{ runner.temp }}/zlib-install -DZLIB_INCLUDE_DIR:PATH=${{ runner.temp }}/zlib-install/include -DZLIB_LIBRARY:PATH=${{ runner.temp }}/zlib-install/lib/zlibstatic.lib -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/hdf5-install ${{ runner.temp }}/hdf5-2.0.0
35+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON -DZLIB_ROOT:PATH=${{ runner.temp }}/zlib-install -DZLIB_INCLUDE_DIR:PATH=${{ runner.temp }}/zlib-install/include -DZLIB_LIBRARY:PATH=${{ runner.temp }}/zlib-install/lib/zs.lib -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/hdf5-install ${{ runner.temp }}/hdf5-2.0.0
4536
cmake --build . --config Release -j2
4637
cmake --build . --config Release --target INSTALL
4738
- name: Boost install
@@ -57,7 +48,7 @@ jobs:
5748
cd ${{ github.workspace }}/..
5849
mkdir build
5950
cd build
60-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ROOT=${{ runner.temp }}/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DMINIZIP_ROOT=${{ runner.temp }}/minizip-install -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DBoost_INCLUDE_DIR=${{ runner.temp }}/boost-install -DWITH_EXAMPLE=TRUE -DWITH_RESQML2_2=TRUE -DWITH_DOTNET_WRAPPING=TRUE -DSWIG_EXECUTABLE=${{ runner.temp }}/swigwin-4.4.1/swig.exe -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ github.workspace }}
51+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ROOT=${{ runner.temp }}/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DMINIZIP_ROOT=${{ runner.temp }}/zlib-install -DMINIZIP_USE_STATIC_LIBS=TRUE -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DBoost_INCLUDE_DIR=${{ runner.temp }}/boost-install -DWITH_EXAMPLE=TRUE -DWITH_RESQML2_2=TRUE -DWITH_DOTNET_WRAPPING=TRUE -DSWIG_EXECUTABLE=${{ runner.temp }}/swigwin-4.4.1/swig.exe -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ github.workspace }}
6152
cmake --build . --config Release -j2
6253
cmake --build . --config Release --target INSTALL
6354
- name: Add msbuild to PATH
@@ -179,26 +170,32 @@ jobs:
179170
CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*
180171
CIBW_ARCHS: auto64
181172
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
182-
CIBW_BEFORE_ALL: >
183-
yum install -y wget gcc-c++ boost-devel &&
184-
yum search epel-release &&
185-
yum info epel-release &&
186-
yum install -y epel-release &&
187-
yum --enablerepo=epel install -y minizip1.2-devel cmake3 &&
188-
wget --no-verbose https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/hdf5-2.0.0.tar.gz &&
189-
tar -xzf hdf5-2.0.0.tar.gz &&
190-
cd hdf5-2.0.0 &&
191-
mkdir build &&
192-
cd build &&
193-
cmake -G "Unix Makefiles" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../hdf5-install .. &&
194-
cmake --build . --config Release &&
195-
make -j4 &&
196-
make install &&
197-
cd ../.. &&
198-
mkdir build &&
199-
cd build &&
200-
cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install {project} &&
201-
cmake3 --build . -j2 --config Release &&
173+
CIBW_BEFORE_ALL: |
174+
yum remove cmake
175+
yum install -y wget gcc-c++ boost-devel
176+
yum search epel-release
177+
yum info epel-release
178+
yum install -y epel-release
179+
yum --enablerepo=epel install -y minizip1.2-devel
180+
cd ${{ github.workspace }}/..
181+
wget https://github.com/Kitware/CMake/releases/download/v4.3.2/cmake-4.3.2-linux-x86_64.tar.gz
182+
tar -xzf cmake-4.3.2-linux-x86_64.tar.gz
183+
export PATH=${{ github.workspace }}/../cmake-4.3.2-linux-x86_64/bin:$PATH
184+
cmake --version # Should cmake version
185+
wget --no-verbose https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/hdf5-2.0.0.tar.gz
186+
tar -xzf hdf5-2.0.0.tar.gz
187+
cd hdf5-2.0.0
188+
mkdir build
189+
cd build
190+
cmake -G "Unix Makefiles" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../hdf5-install ..
191+
cmake --build . --config Release
192+
make -j4
193+
make install
194+
cd ../..
195+
mkdir build
196+
cd build
197+
cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install {project}
198+
cmake3 --build . -j2 --config Release
202199
cmake3 --install .
203200
CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
204201
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/fesapi-install/lib64 &&

‎cmake/modules/FindMINIZIP.cmake‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@ set(_MINIZIP_SEARCH_NORMAL
4848
unset(_MINIZIP_x86)
4949
list(APPEND _MINIZIP_SEARCHES _MINIZIP_SEARCH_NORMAL)
5050

51-
set(MINIZIP_NAMES minizip minizips)
52-
set(MINIZIP_NAMES_DEBUG minizipd minizipsd minizip_d)
51+
if(MINIZIP_USE_STATIC_LIBS)
52+
set(MINIZIP_NAMES minizips minizip)
53+
set(MINIZIP_NAMES_DEBUG minizipsd minizipd minizip_d)
54+
else()
55+
set(MINIZIP_NAMES minizip)
56+
set(MINIZIP_NAMES_DEBUG minizipd minizip_d)
57+
endif()
5358

5459
# Try each search configuration.
5560
foreach(search ${_MINIZIP_SEARCHES})

0 commit comments

Comments
 (0)