Lion #6

Merged
merged 3 commits into from Apr 30, 2012

Conversation

Projects
None yet
2 participants
Owner

davvid commented Apr 30, 2012

Fix build issues found on OS X Lion.

davvid added some commits Apr 30, 2012

SeExprBuildins.cpp: Avoid ambiguous operator overloading
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.
cmake: Allow specifying the library directory
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.

@aselle aselle closed this Apr 30, 2012

Contributor

aselle commented Apr 30, 2012

Merging fixes for LLVM and other misc fixes.

@aselle aselle reopened this Apr 30, 2012

aselle added a commit that referenced this pull request Apr 30, 2012

@aselle aselle merged commit 08f8fd1 into wdas:master Apr 30, 2012

@davvid davvid deleted the davvid:lion branch Jul 1, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment