Skip to content

Fix OS X build when CMAKE_BUILD_WITH_INSTALL_RPATH is enabled #97

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

Closed
msmolens wants to merge 1 commit into from
Closed

Fix OS X build when CMAKE_BUILD_WITH_INSTALL_RPATH is enabled #97

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: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,15 @@ if(BUILD_TESTING)
set(TESTOPTS -l ${EXTRATESTOPTS})
set(TESTPROG ${CMAKE_BINARY_DIR}/${PYTHONHOME}/test/regrtest.py)
set(TESTPYTHONOPTS )
set(TESTPYTHONWRAPPER )
if(APPLE AND BUILD_SHARED)
set(TESTPYTHONWRAPPER env DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/${LIBPYTHON_LIBDIR})
endif()
set(TESTPYTHON $<TARGET_FILE:python> -Wd -3 -E -tt ${TESTPYTHONOPTS})

include(cmake/UnitTests.cmake)
foreach(unittest ${unittests})
add_test(NAME ${unittest} COMMAND ${TESTPYTHON} ${TESTPROG} ${TESTOPTS} ${unittest})
add_test(NAME ${unittest} COMMAND ${TESTPYTHONWRAPPER} ${TESTPYTHON} ${TESTPROG} ${TESTOPTS} ${unittest})
endforeach(unittest)
endif(BUILD_TESTING)

Expand Down
6 changes: 5 additions & 1 deletion cmake/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@ install(TARGETS python EXPORT PythonTargets RUNTIME DESTINATION ${BIN_INSTALL_DI

if(UNIX AND PY_VERSION VERSION_GREATER "2.7.4")
# Setup landmark allowing to run the interpreter from a build tree. See 'getpath.c' for details.
set(PYTHON_WRAPPER_COMMAND )
if(APPLE AND BUILD_SHARED)
set(PYTHON_WRAPPER_COMMAND env DYLD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/${LIBPYTHON_LIBDIR}")
endif()
add_custom_command(
OUTPUT ${BIN_BUILD_DIR}/pybuilddir.txt ${EXTENSION_BUILD_DIR}/_sysconfigdata.py
COMMAND $<TARGET_FILE:python> -E -S -m sysconfig --generate-posix-vars
COMMAND ${PYTHON_WRAPPER_COMMAND} $<TARGET_FILE:python> -E -S -m sysconfig --generate-posix-vars
COMMAND ${CMAKE_COMMAND}
-DBIN_BUILD_DIR:PATH=${BIN_BUILD_DIR}
-DPYTHON_BINARY_DIR:PATH=${CMAKE_BINARY_DIR}
Expand Down