diff --git a/SConstruct b/SConstruct index 11dcabca1c..526769a340 100644 --- a/SConstruct +++ b/SConstruct @@ -723,6 +723,12 @@ o.Add( "$INSTALL_PREFIX/maya/icons", ) +o.Add( + "INSTALL_NUKEICON_DIR", + "The directory under which to install nuke icons.", + "$INSTALL_PREFIX/nuke/icons", +) + o.Add( "INSTALL_MAYAPLUGIN_NAME", "The name under which to install maya plugins.", @@ -2445,6 +2451,12 @@ if doConfigure : nukeStubs.append( nukeStub ) Default( [ nukeStub ] ) + # nuke icons + nukeIcons = glob.glob( "icons/IECoreNuke/*.png" ) + nukeIconInstall = nukeEnv.Install( "$INSTALL_NUKEICON_DIR", source=nukeIcons ) + nukeEnv.Alias( "install", nukeIconInstall ) + nukeEnv.Alias( "installNuke", nukeIconInstall ) + # nuke tests nukeTest = nukeTestEnv.Command( "test/IECoreNuke/resultsPython.txt", nukeLibrary, "echo \"execfile( '$TEST_NUKE_SCRIPT' )\" | $NUKE_ROOT/Nuke${NUKE_MAJOR_VERSION}.${NUKE_MINOR_VERSION} -t" ) diff --git a/config/ie/options b/config/ie/options index 14297e3162..5bc2322622 100644 --- a/config/ie/options +++ b/config/ie/options @@ -208,7 +208,10 @@ if getOption( "RELEASE", "0" )!="1" : basePrefix = os.path.join( installPrefix, "base" ) if targetApp : - appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion ) + if targetApp in ( "nuke", ): + appPrefix = os.path.join( installPrefix, targetApp, compatibilityVersion ) + else: + appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion ) # find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable. dlReg = None @@ -311,6 +314,7 @@ if targetApp=="nuke" : NUKE_LICENSE_FILE = nukeReg["wrapperEnvVars"]["foundry_LICENSE"] INSTALL_NUKELIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_MAJOR_VERSION" ) INSTALL_NUKEPYTHON_DIR = os.path.join( appPrefix, "python" ) + INSTALL_NUKEICON_DIR = os.path.join( appPrefix, "icons" ) INSTALL_NUKEPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" ) # find houdini if we're building for houdini diff --git a/icons/IECoreNuke/CortexMenu.png b/icons/IECoreNuke/CortexMenu.png new file mode 100644 index 0000000000..5b0a1f20c6 Binary files /dev/null and b/icons/IECoreNuke/CortexMenu.png differ diff --git a/src/IECoreNuke/plugin/menu.py b/src/IECoreNuke/plugin/menu.py index 3eebf42561..4e19202811 100644 --- a/src/IECoreNuke/plugin/menu.py +++ b/src/IECoreNuke/plugin/menu.py @@ -49,7 +49,7 @@ import nuke nodesMenu = nuke.menu( "Nodes" ) - cortexMenu = nodesMenu.addMenu( "Cortex" ) + cortexMenu = nodesMenu.addMenu( "Cortex", icon="CortexMenu.png" ) cortexMenu.addCommand( "Display", "nuke.createNode( 'ieDisplay' )" ) cortexMenu.addCommand( "LensDistort", "nuke.createNode( 'ieLensDistort' )" )