System python updated #974
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rather than pointing to CMAKE_INSTALL_PREFIX it should
point to ${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages
A pixman is needed by Cairo, we don't want to require Cairo before it can be built.
Use CMake variable so that we pick up the correct version of SIP
If system FFMPEG is present these header will be picked up and there may be a version miss match. Conflicts: CMake/cdat_modules_extra/ffmpeg_configure_step.cmake.in
The misplaced " result in a ; separated string as CMake treats the variable as a list.
The Ubuntu packaged modules appear to be broken.
Conflicts: testing/dv3d/CMakeLists.txt testing/dv3d/TestManager.py testing/dv3d/basic_run_test.py testing/vcs/test_vcs_close.py
|
did you test it? Last I tried it didn't work, we shouldn't approve our own branches @aashish24 will run a build now on my systems and will report any issues (if any). This shouldn't hurt the regular build so I guess it's ok. |
|
This PR breaks the build for OSX 10.8. I was attempting to update my dev version of UV-CDAT and ran into a bunch of build errors in the same vein; it turned out the MyProxyClient was trying to install itself into $INSTALL_PREFIX/lib/python2.7/site-packages instead of $INSTALL_PREFIX/Library/.../python2.7/site-packages, and didn't like it. I checked out commit e114e06, and the build worked fine. |
|
@aashish24 we should either fix quickly or revert right, see, never self merge ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated