Merged
Conversation
i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.9.00) from Mac OS X Lion, and possibly others, fail to build due to expressions that contain ambiguous overloaded operators. .../src/SeExpr/SeExprBuiltins.cpp:596:28: error: use of overloaded operator '+' is ambiguous (with operand types 'SeVec3d' and 'double') return .5*vnoise(p)+.5; ~~~~~~~~~~~~^~~ .../src/SeExpr/SeExprBuiltins.cpp:857:65: error: use of overloaded operator '-' is ambiguous (with operand types 'SeVec3d' and 'double') ...data.points[n] = testcell + jitter * (ccellnoise(testcell - .5)); ~~~~~~~~ ^ ~~ Use SeVec3d(double) in these expressions to avoid ambiguities.
Add a CMAKE_INSTALL_LIBDIR variable to allow packagers to specify the library directory name. The default is "lib64", but some systems use "lib", so allow users to specify the basename.
Contributor
|
Merging fixes for LLVM and other misc fixes. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fix build issues found on OS X Lion.