Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump zlib #620

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Bump zlib #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/build_zlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
)
args, _ = parser.parse_known_args()

archive = download_file('https://www.zlib.net/fossils/zlib-1.3.tar.gz',
checksum='ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e')
archive = download_file('https://www.zlib.net/fossils/zlib-1.3.1.tar.gz',
checksum='9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23')

root = Path(__file__).parent

Expand Down Expand Up @@ -68,7 +68,7 @@
cmake_args +
['-B', build_dir,
'-D', f'CMAKE_INSTALL_PREFIX={ install_prefix }',
root / 'zlib-1.3']
root / 'zlib-1.3.1']
)

check_call([
Expand Down
2 changes: 1 addition & 1 deletion fmusim-gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(CVODE_DIR ${CMAKE_SOURCE_DIR}/build/cvode-x86_64-windows/install)
set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/build/libxml2-x86_64-windows/install)
set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/build/zlib-x86_64-windows/install)

set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3)
set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3.1)

find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets)
Expand Down
6 changes: 3 additions & 3 deletions fmusim-gui/build/build_zlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from fmpy.util import download_file


archive = download_file('https://www.zlib.net/fossils/zlib-1.3.tar.gz',
checksum='ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e')
archive = download_file('https://www.zlib.net/fossils/zlib-1.3.1.tar.gz',
checksum='9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23')

root = Path(__file__).parent

Expand All @@ -26,7 +26,7 @@
cmake_args +
['-B', build_dir,
'-D', f'CMAKE_INSTALL_PREFIX={ install_prefix }',
str(root / 'zlib-1.3')]
str(root / 'zlib-1.3.1')]
)

check_call([
Expand Down
2 changes: 1 addition & 1 deletion fmusim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(FMUSIM_VERSION "" CACHE STRING "")
set(CVODE_DIR ${CMAKE_SOURCE_DIR}/build/cvode-${FMI_PLATFORM}/install/)
set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/build/libxml2-${FMI_PLATFORM}/install/)
set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/build/zlib-${FMI_PLATFORM}/install/)
set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3/)
set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3.1/)

if (WIN32)
set(FMUSIM_DIST_DIR ${CMAKE_BINARY_DIR}/dist/fmusim-windows/)
Expand Down
Loading