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

i#7025: Restore msgbox_mask package defaults #7030

Merged
merged 1 commit into from
Oct 9, 2024
Merged

i#7025: Restore msgbox_mask package defaults #7030

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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2010-2023 Google, Inc. All rights reserved.
# Copyright (c) 2010-2024 Google, Inc. All rights reserved.
# Copyright (c) 2009-2010 VMware, Inc. All rights reserved.
# Copyright (c) 2018 Arm Limited All rights reserved.
# **********************************************************
Expand Down Expand Up @@ -1840,7 +1840,8 @@ endfunction ()
# TODO i#5767: Install an explicit zlib package on our Windows GA CI images
# (this find_package finds a strawberry perl zlib which causes 32-bit build
# and 64-bit private loader issues).
if (WIN32 AND AUTOMATED_TESTING)
option(DISABLE_ZLIB "Disable looking for and using zlib" OFF)
if (WIN32 AND NOT DISABLE_ZLIB)
set(ZLIB_FOUND OFF)
else ()
find_package(ZLIB)
Expand Down
9 changes: 7 additions & 2 deletions make/package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2011-2022 Google, Inc. All rights reserved.
# Copyright (c) 2011-2024 Google, Inc. All rights reserved.
# Copyright (c) 2009-2010 VMware, Inc. All rights reserved.
# **********************************************************

Expand Down Expand Up @@ -164,10 +164,15 @@ set(base_cache "
BUILD_NUMBER:STRING=${arg_build}
UNIQUE_BUILD_NUMBER:STRING=${arg_ubuild}
BUILD_PACKAGE:BOOL=ON
AUTOMATED_TESTING:BOOL=ON
${arg_cacheappend}
")

if (WIN32)
# TODO i#5767: Install a working zlib package on our Windows GA CI images.
set(base_cache "${base_cache}
DISABLE_ZLIB:BOOL=ON")
endif()

# version is optional
if (arg_version)
set(base_cache "${base_cache}
Expand Down
Loading