matches sdk to os or fails. fix #1319 #1320
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
|
@doutriaux1 looks like you might be missing some baseline/test images https://open.cdash.org/testDetails.php?test=335626893&build=3810495 |
|
thanks @durack1 CDAT/uvcdat-testdata#49 hadnt been merged in after merging the PR. @aashish24 please be careful about this when merging. Thanks. |
|
@doutriaux1 want to tweak the PR to initialize a rebuild? |
|
nah... |
| set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -headerpad_max_install_names") | ||
| set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8 CACHE STRING "" FORCE) | ||
| set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk" CACHE PATH "" FORCE) | ||
| elseif((${OS_X_VER_MAJOR} VERSION_EQUAL 9) AND (HAVE_10_9_SDK)) |
There was a problem hiding this comment.
I think its perfectly valid to use 10.8 SDK on say Mac 10.9. But if this works better then I am fine with that.
aashish24
added a commit
that referenced
this pull request
May 14, 2015
matches sdk to os or fails. fix #1319
|
LGTM |
Merged
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.
@aashish24 @remram44 please review. @remram44 please put all of your sdks back in as before and let me know if it still fails building.