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

On OSX, '-mmacosx-version-min=XXX' compile and link options management #956

Merged
merged 2 commits into from
Sep 8, 2023
Merged

On OSX, '-mmacosx-version-min=XXX' compile and link options management #956

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d2298
On OSX, add '-mmacosx-version-min=XXX' compile and link options when …
VincentRouvreau Sep 8, 2023
ee221bd
[skip ci] code review: Rework comment about CMAKE_OSX_DEPLOYMENT_TARGET
VincentRouvreau Sep 8, 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
7 changes: 5 additions & 2 deletions src/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,11 @@ if(PYTHONINTERP_FOUND)

# Specific for Mac
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-mmacosx-version-min=10.14', ")
set(GUDHI_PYTHON_EXTRA_LINK_ARGS "${GUDHI_PYTHON_EXTRA_LINK_ARGS}'-mmacosx-version-min=10.14', ")
# if MACOSX_DEPLOYMENT_TARGET environment variable is set
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't CMAKE_OSX_DEPLOYMENT_TARGET always defined? (not an issue, just surprised by the comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not aware of this behavior, but yes you are right, it seems CMAKE_OSX_DEPLOYMENT_TARGET is always set on OSx. I reworked the comment on ee221bd

if(CMAKE_OSX_DEPLOYMENT_TARGET)
set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}', ")
set(GUDHI_PYTHON_EXTRA_LINK_ARGS "${GUDHI_PYTHON_EXTRA_LINK_ARGS}'-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}', ")
endif()
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

# Strip dynamic libraries in release mode for smaller pip packages under linux
Expand Down