|
@@ -125,18 +125,18 @@ if(APPLE)
|
|
|
set(RESOURCE_ROOT Resources)
|
|
|
endif()
|
|
|
|
|
|
-if(NOT DEFINED CONAN_WEB-CLIENT-TV_ROOT)
|
|
|
+if(NOT DEFINED CONAN_WEB-CLIENT-TV2_ROOT)
|
|
|
message(FATAL_ERROR "Could not find the web-client! Run conan!")
|
|
|
endif()
|
|
|
|
|
|
-add_resources(TARGET ${MAIN_TARGET} SOURCES ${CONAN_WEB-CLIENT-TV_ROOT}/tv DEST ${RESOURCE_ROOT}/web-client/tv)
|
|
|
+add_resources(TARGET ${MAIN_TARGET} SOURCES ${CONAN_WEB-CLIENT-TV2_ROOT}/tv DEST ${RESOURCE_ROOT}/web-client/tv)
|
|
|
if(DEFINED CONAN_WEB-CLIENT-DESKTOP_ROOT)
|
|
|
add_resources(TARGET ${MAIN_TARGET} SOURCES ${CONAN_WEB-CLIENT-DESKTOP_ROOT}/desktop DEST ${RESOURCE_ROOT}/web-client/desktop)
|
|
|
endif()
|
|
|
|
|
|
if(NOT APPLE)
|
|
|
install(FILES ${QTROOT}/resources/qtwebengine_devtools_resources.pak DESTINATION resources)
|
|
|
- install(DIRECTORY ${CONAN_WEB-CLIENT-TV_ROOT}/tv DESTINATION ${INSTALL_RESOURCE_DIR}/web-client)
|
|
|
+ install(DIRECTORY ${CONAN_WEB-CLIENT-TV2_ROOT}/tv DESTINATION ${INSTALL_RESOURCE_DIR}/web-client)
|
|
|
if(DEFINED CONAN_WEB-CLIENT-DESKTOP_ROOT)
|
|
|
install(DIRECTORY ${CONAN_WEB-CLIENT-DESKTOP_ROOT}/desktop DESTINATION ${INSTALL_RESOURCE_DIR}/web-client)
|
|
|
endif()
|