@@ -1765,7 +1765,7 @@ corePythonModuleEnv.Append( LIBS = os.path.basename( coreEnv.subst( "$INSTALL_LI
17651765corePythonModuleEnv .Append ( LIBS = os .path .basename ( corePythonEnv .subst ( "$INSTALL_PYTHONLIB_NAME" ) ) )
17661766corePythonModule = corePythonModuleEnv .SharedLibrary ( "python/IECore/_IECore" , corePythonModuleSources )
17671767corePythonModuleEnv .Depends ( corePythonModule , coreLibrary )
1768- corePythonModuleEnv .Depends ( corePythonModule , corePythonLibrary )
1768+ corePythonModuleEnv .Depends ( corePythonModule , corePythonLibraryInstall )
17691769
17701770corePythonModuleInstall = corePythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECore" , corePythonScripts + corePythonModule )
17711771corePythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECore" , lambda target , source , env : makeSymLinks ( corePythonEnv , corePythonEnv ["INSTALL_PYTHON_DIR" ] ) )
@@ -1913,6 +1913,7 @@ if doConfigure :
19131913 )
19141914 imagePythonModule = imagePythonModuleEnv .SharedLibrary ( "python/IECoreImage/_IECoreImage" , imagePythonSources + imagePythonModuleSources )
19151915 imagePythonModuleEnv .Depends ( imagePythonModule , imageLibrary )
1916+ imagePythonModuleEnv .Depends ( imagePythonModule , corePythonLibraryInstall )
19161917
19171918 # python module install
19181919 imagePythonModuleInstall = imagePythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreImage" , imagePythonScripts + imagePythonModule )
@@ -1987,7 +1988,7 @@ if doConfigure :
19871988 scenePythonModuleEnv .Append ( LIBS = os .path .basename ( sceneEnv .subst ( "$INSTALL_LIB_NAME" ) ) )
19881989 scenePythonModule = scenePythonModuleEnv .SharedLibrary ( "python/IECoreScene/_IECoreScene" , scenePythonModuleSources )
19891990 scenePythonModuleEnv .Depends ( scenePythonModule , coreLibrary )
1990- scenePythonModuleEnv .Depends ( scenePythonModule , corePythonLibrary )
1991+ scenePythonModuleEnv .Depends ( scenePythonModule , corePythonLibraryInstall )
19911992 scenePythonModuleEnv .Depends ( scenePythonModule , sceneLibrary )
19921993
19931994 scenePythonModuleInstall = scenePythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreScene" , scenePythonScripts + scenePythonModule )
@@ -2087,6 +2088,7 @@ if doConfigure :
20872088 )
20882089 vdbPythonModule = vdbPythonModuleEnv .SharedLibrary ( "python/IECoreVDB/_IECoreVDB" , vdbPythonModuleSources )
20892090 vdbPythonModuleEnv .Depends ( vdbPythonModule , vdbLibrary )
2091+ vdbPythonModuleEnv .Depends ( vdbPythonModule , corePythonLibraryInstall )
20902092
20912093 vdbPythonModuleInstall = vdbPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreVDB" , vdbPythonScripts + vdbPythonModule )
20922094 vdbPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreVDB" , lambda target , source , env : makeSymLinks ( vdbPythonModuleEnv , vdbPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
@@ -2274,6 +2276,7 @@ if env["WITH_GL"] and doConfigure :
22742276 )
22752277 glPythonModule = glPythonModuleEnv .SharedLibrary ( "python/IECoreGL/_IECoreGL" , glPythonSources )
22762278 glPythonModuleEnv .Depends ( glPythonModule , glLibrary )
2279+ glPythonModuleEnv .Depends ( glPythonModule , corePythonLibraryInstall )
22772280
22782281 glPythonScripts = glob .glob ( "python/IECoreGL/*.py" )
22792282 glPythonModuleInstall = glPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreGL" , glPythonScripts + glPythonModule )
@@ -2470,6 +2473,7 @@ if doConfigure :
24702473 )
24712474 mayaPythonModule = mayaPythonModuleEnv .SharedLibrary ( "python/IECoreMaya/_IECoreMaya" , mayaPythonSources )
24722475 mayaPythonModuleEnv .Depends ( mayaPythonModule , mayaLibrary )
2476+ mayaPythonModuleEnv .Depends ( mayaPythonModule , corePythonLibraryInstall )
24732477
24742478 mayaPythonModuleInstall = mayaPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreMaya" , mayaPythonScripts + mayaPythonModule )
24752479 mayaPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreMaya" , lambda target , source , env : makeSymLinks ( mayaPythonModuleEnv , mayaPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
@@ -2685,6 +2689,7 @@ if doConfigure :
26852689 nukePythonModuleEnv .Alias ( "install" , nukePythonModuleInstall )
26862690 nukePythonModuleEnv .Alias ( "installNuke" , nukePythonModuleInstall )
26872691 nukePythonModuleEnv .Depends ( nukePythonModule , corePythonModule )
2692+ nukePythonModuleEnv .Depends ( nukePythonModule , corePythonLibraryInstall )
26882693
26892694 if coreEnv ["INSTALL_CORENUKE_POST_COMMAND" ]!= "" :
26902695 # this is the only way we could find to get a post action to run for an alias
@@ -2914,6 +2919,7 @@ if doConfigure :
29142919 )
29152920 houdiniPythonModule = houdiniPythonModuleEnv .SharedLibrary ( "python/IECoreHoudini/_IECoreHoudini" , houdiniPythonSources )
29162921 houdiniPythonModuleEnv .Depends ( houdiniPythonModule , houdiniLib )
2922+ houdiniPythonModuleEnv .Depends ( houdiniPythonModule , corePythonLibraryInstall )
29172923 houdiniPythonModuleInstall = houdiniPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreHoudini" , houdiniPythonScripts + houdiniPythonModule )
29182924 houdiniPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreHoudini" , lambda target , source , env : makeSymLinks ( houdiniPythonModuleEnv , houdiniPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
29192925 houdiniPythonModuleEnv .Alias ( "install" , houdiniPythonModuleInstall )
@@ -3115,6 +3121,7 @@ if doConfigure :
31153121 )
31163122 usdPythonModule = usdPythonModuleEnv .SharedLibrary ( "contrib/IECoreUSD/python/IECoreUSD/_IECoreUSD" , usdPythonSources )
31173123 usdPythonModuleEnv .Depends ( usdPythonModule , usdLibrary )
3124+ usdPythonModuleEnv .Depends ( usdPythonModule , corePythonLibraryInstall )
31183125
31193126 usdPythonModuleInstall = usdPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreUSD" , usdPythonScripts + usdPythonModule )
31203127 usdPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreUSD" , lambda target , source , env : makeSymLinks ( usdPythonModuleEnv , usdPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
@@ -3249,6 +3256,7 @@ if doConfigure :
32493256 alembicPythonModule = alembicPythonModuleEnv .SharedLibrary ( "contrib/IECoreAlembic/python/IECoreAlembic/_IECoreAlembic" , alembicPythonSources )
32503257 alembicPythonModuleEnv .Depends ( alembicPythonModule , alembicLibrary )
32513258 alembicPythonModuleEnv .Depends ( alembicPythonModule , scenePythonModule )
3259+ alembicPythonModuleEnv .Depends ( alembicPythonModule , corePythonLibraryInstall )
32523260
32533261 alembicPythonModuleInstall = alembicPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreAlembic" , alembicPythonScripts + alembicPythonModule )
32543262 alembicPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreAlembic" , lambda target , source , env : makeSymLinks ( alembicPythonModuleEnv , alembicPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
@@ -3384,6 +3392,7 @@ if doConfigure :
33843392 )
33853393 appleseedPythonModule = appleseedPythonModuleEnv .SharedLibrary ( "contrib/IECoreAppleseed/python/IECoreAppleseed/_IECoreAppleseed" , appleseedPythonSources )
33863394 appleseedPythonModuleEnv .Depends ( appleseedPythonModule , appleseedLibrary )
3395+ appleseedPythonModuleEnv .Depends ( appleseedPythonModule , corePythonLibraryInstall )
33873396
33883397 appleseedPythonModuleInstall = appleseedPythonModuleEnv .Install ( "$INSTALL_PYTHON_DIR/IECoreAppleseed" , appleseedPythonScripts + appleseedPythonModule )
33893398 appleseedPythonModuleEnv .AddPostAction ( "$INSTALL_PYTHON_DIR/IECoreAppleseed" , lambda target , source , env : makeSymLinks ( appleseedPythonModuleEnv , appleseedPythonModuleEnv ["INSTALL_PYTHON_DIR" ] ) )
0 commit comments