Skip to content
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.

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

Lion #6

Merged
merged 3 commits into from Apr 30, 2012
Merged

Lion #6

merged 3 commits into from Apr 30, 2012

Commits on Apr 30, 2012

  1. Copy the full SHA
    b7855a5 View commit details
    Browse the repository at this point in the history
  2. 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.
    davvid committed Apr 30, 2012
    Copy the full SHA
    e15bd3c View commit details
    Browse the repository at this point in the history
  3. 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.
    davvid committed Apr 30, 2012
    Copy the full SHA
    2fe2201 View commit details
    Browse the repository at this point in the history