diff --git a/.gitignore b/.gitignore index eb325ebd..e9428e74 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,6 @@ # Nvidia build folder extern/nvidia/_build -# Ignore symlink to Omniverse Code -extern/nvidia/app - # Python cache __pycache__ diff --git a/apps/cesium.omniverse.cpp.tests.runner.kit b/apps/cesium.omniverse.cpp.tests.runner.kit index a991c45d..a812ac86 100644 --- a/apps/cesium.omniverse.cpp.tests.runner.kit +++ b/apps/cesium.omniverse.cpp.tests.runner.kit @@ -16,5 +16,4 @@ folders.'++' = [ "${app}", # Find other applications in this folder "${app}/exts", # Find extensions in this folder "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas - "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph ] diff --git a/apps/cesium.omniverse.dev.kit b/apps/cesium.omniverse.dev.kit index dad99703..ac1005cd 100644 --- a/apps/cesium.omniverse.dev.kit +++ b/apps/cesium.omniverse.dev.kit @@ -6,7 +6,7 @@ app = true [dependencies] # Include basic configuration (that brings most of basic extensions) "omni.app.base" = {} -"omni.kit.window.material_graph" = {optional = true} +"omni.kit.window.material_graph" = {} "cesium.omniverse" = {} "cesium.powertools" = {} "omni.curve.manipulator" = {} @@ -26,5 +26,4 @@ folders.'++' = [ "${app}", # Find other applications in this folder "${app}/exts", # Find extensions in this folder "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas - "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph ] diff --git a/apps/cesium.omniverse.dev.python.debug.kit b/apps/cesium.omniverse.dev.python.debug.kit index 8370c14f..ad884f07 100644 --- a/apps/cesium.omniverse.dev.python.debug.kit +++ b/apps/cesium.omniverse.dev.python.debug.kit @@ -16,5 +16,4 @@ folders.'++' = [ "${app}", # Find other applications in this folder "${app}/exts", # Find extensions in this folder "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas - "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph ] diff --git a/apps/cesium.omniverse.dev.trace.kit b/apps/cesium.omniverse.dev.trace.kit index ab9326d7..2993354e 100644 --- a/apps/cesium.omniverse.dev.trace.kit +++ b/apps/cesium.omniverse.dev.trace.kit @@ -15,5 +15,4 @@ folders.'++' = [ "${app}", # Find other applications in this folder "${app}/exts", # Find extensions in this folder "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas - "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph ] diff --git a/apps/cesium.performance.kit b/apps/cesium.performance.kit index dc9c66de..047fa699 100644 --- a/apps/cesium.performance.kit +++ b/apps/cesium.performance.kit @@ -15,5 +15,4 @@ folders.'++' = [ "${app}", # Find other applications in this folder "${app}/exts", # Find extensions in this folder "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas - "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph ] diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 4818e0c0..00d44fdf 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -189,21 +189,6 @@ if(exit_code AND NOT exit_code EQUAL 0) endif() # cmake-format: on -# Add a symlink to USD Composer (create) so that we can use its extensions (e.g. omni.kit.window.material_graph) in our internal applications -if(UNIX) - execute_process(COMMAND bash -c "${PROJECT_SOURCE_DIR}/extern/nvidia/link_app.sh --app create" - RESULT_VARIABLE exit_code) -elseif(WIN32) - execute_process(COMMAND cmd /C "${PROJECT_SOURCE_DIR}/extern/nvidia/link_app.bat --app create" - RESULT_VARIABLE exit_code) -endif() - -# cmake-format: off -if(exit_code AND NOT exit_code EQUAL 0) - message(WARNING "Could not find USD Composer which contains the material graph extension needed by cesium.omniverse.dev.kit. While Cesium for Omniverse will still build fine, running cesium.omniverse.dev.kit will fail.") -endif() -# cmake-format: on - set(NVIDIA_RELEASE_FOLDER_NAME "release") if(${USE_NVIDIA_RELEASE_LIBRARIES})