Page MenuHome

Change install_deps.sh to install OSD in the autodetect path in cmake
ClosedPublic

Authored by Jeffrey Hoover (italic_) on Nov 27 2015, 6:31 AM.

Details

Summary

I bumped the python version from 3.4 to 3.5 for the recent py upgrade. OSD was also not being found by default, so I updated the OSD module to point to the default path set through install_deps.sh.

EDIT1: Removed edits to cmake modules and changed pathing in install_deps.sh to install OSD in /opt/lib/opensubdiv instead of /opt/lib/osd

Diff Detail

Repository
rB Blender

Event Timeline

Jeffrey Hoover (italic_) retitled this revision from to Update cmake modules for py 3.5 and default OSD paths.
Jeffrey Hoover (italic_) updated this object.
Jeffrey Hoover (italic_) set the repository for this revision to rB Blender.

actually just saw that python has already been taken care of and only need to commit the OSD fix

I'm skeptical about the change in CMake. it's more like install_deps made a mistake in the default path. it's also something we'll break existing setups if we change CMake. Changing install_deps.sh should not cause problems because it already demanded passing explicit path to OpenSubdiv.

P.S. We can do crazy alternative thing -- allow both /opt/lib/opensubdiv and /opt/lib/osd.

Talked to Campbell in IRC. Let's simply update install_deps.sh script to use /opt/lib/opensubdiv. This will keep existing setups working and will simply make it less arguments to pass to cmake after sing the install script.

Sergey Sharybin (sergey) requested changes to this revision.Nov 28 2015, 11:32 AM
Sergey Sharybin (sergey) edited edge metadata.
This revision now requires changes to proceed.Nov 28 2015, 11:32 AM
Jeffrey Hoover (italic_) edited edge metadata.

I updated install_deps.sh to /opt/lib/opensubdiv pathing as suggested by @Sergey Sharybin (sergey) and removed edits on the cmake modules. I've tested with a fresh deps build and it seems to run smoothly, although it would be good to run by more experienced eyes to make sure. I've included an attached build log for you to make sure.

The other edits are whitespace my editor automatically removed (I use Atom for now).

Jeffrey Hoover (italic_) retitled this revision from Update cmake modules for py 3.5 and default OSD paths to Change install_deps.sh to install OSD in the autodetect path in cmake.Dec 2 2015, 9:01 PM
Jeffrey Hoover (italic_) updated this object.
Jeffrey Hoover (italic_) edited edge metadata.
Sergey Sharybin (sergey) edited edge metadata.

I'm fine with path change and whitespace change, but this changes are to be applied as separate commits (to split functional from non-functional changes).

Accepting assuming you'll split up the changes. AFAIR, you have commit rights?

This revision is now accepted and ready to land.Dec 3 2015, 9:39 AM

I'm fine with path change and whitespace change, but this changes are to be applied as separate commits (to split functional from non-functional changes).

Accepting assuming you'll split up the changes. AFAIR, you have commit rights?

I do not have commit rights. I agree with the split commits.

@Sergey Sharybin (sergey) Any updates with this? I can't commit, so it's just been sitting here doing nothing.

Committed whitespace change now. But for the OpenSubdiv path we decided to simply add an extar search path to FindOpenSubdiv. So this way:

  • No existing setups is broken
  • No need to force re-run CMake after next run of install_deps.

Think so. Please correct me if i'm wrong :)