Skip to content

Fix Python ARM wheel #1741

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

Merged
doug-walker merged 2 commits into from
Jan 4, 2023
Merged

Fix Python ARM wheel #1741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abf5126
Fix minizip-ng CMake args passing
remia Dec 22, 2022
23cf1b6
Merge branch 'main' into fix-minizip-ng-arm-build
doug-walker Jan 4, 2023
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 share/cmake/modules/Findminizip-ng.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ if(NOT minizip_FOUND AND NOT TARGET MINIZIP::minizip)
"${_EXT_DIST_ROOT}/${CMAKE_INSTALL_LIBDIR}/${_minizip-ng_LIB_PREFIX}minizip-ng${_minizip-ng_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")

if(_minizip-ng_TARGET_CREATE)
set(MINIZIP-NG_CMAKE_ARGS
${MINIZIP-NG_CMAKE_ARGS}
set(minizip-ng_CMAKE_ARGS
${minizip-ng_CMAKE_ARGS}
-DCMAKE_CXX_VISIBILITY_PRESET=${CMAKE_CXX_VISIBILITY_PRESET}
-DCMAKE_VISIBILITY_INLINES_HIDDEN=${CMAKE_VISIBILITY_INLINES_HIDDEN}
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
Expand Down Expand Up @@ -265,7 +265,7 @@ if(NOT minizip_FOUND AND NOT TARGET MINIZIP::minizip)
GIT_SHALLOW TRUE
PREFIX "${_EXT_BUILD_ROOT}/libminizip-ng"
BUILD_BYPRODUCTS ${minizip-ng_LIBRARY}
CMAKE_ARGS ${MINIZIP-NG_CMAKE_ARGS}
CMAKE_ARGS ${minizip-ng_CMAKE_ARGS}
EXCLUDE_FROM_ALL TRUE
BUILD_COMMAND ""
INSTALL_COMMAND
Expand Down