mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 5abca9b..d09176b 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -107,10 +107,8 @@ endif()
|
|
set(RESOURCE_ROOT .)
|
|
if(APPLE)
|
|
set(RESOURCE_ROOT Resources)
|
|
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
|
|
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
|
|
- endif()
|
|
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
|
|
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
|
|
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
|
|
endif()
|
|
|
|
if(NOT APPLE)
|
|
@@ -123,9 +121,7 @@ if(NOT APPLE)
|
|
install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
|
|
endif()
|
|
endforeach()
|
|
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
|
|
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
|
|
- endif()
|
|
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
|
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
|
|
endif()
|
|
|