aa

LizardByte · Oct 2, 2023 · e9c4739 · e9c4739
1 parent fbf3f9c
commit e9c4739
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake
@@ -35,4 +35,4 @@ endforeach()
 target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>)  # cmake-lint: disable=C0301
 
 #WebUI build
-add_custom_target (web-ui ALL WORKING_DIRECTORY  COMMAND bash -c 'npm install && SUNSHINE_SOURCE_ASSETS_DIR=${SUNSHINE_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${CMAKE_BINARY_DIR}/${SUNSHINE_ASSETS_DIR} npm run build')
+add_custom_target (web-ui ALL WORKING_DIRECTORY  COMMAND bash -c 'npm install && SUNSHINE_SOURCE_ASSETS_DIR=${SUNSHINE_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${CMAKE_BINARY_DIR} npm run build')
diff --git a/vite.config.js b/vite.config.js
@@ -22,7 +22,7 @@ if (process.env.SUNSHINE_SOURCE_ASSETS_DIR) {
 }
 if (process.env.SUNSHINE_ASSETS_DIR) {
     console.log("Using destdir from Cmake: " + resolve(process.env.SUNSHINE_ASSETS_DIR,"assets/web"));
-    assetsDstPath = process.env.SUNSHINE_ASSETS_DIR
+    assetsDstPath = resolve(process.env.SUNSHINE_ASSETS_DIR,process.env.SUNSHINE_ASSETS_DIR)
 }
 
 let header = fs.readFileSync(resolve(assetsSrcPath, "template_header.html"))