From e8d1bc5f4bc4eb8416e91823c7c75f46fa05b251 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 8 Feb 2024 09:18:59 +0100 Subject: [PATCH] [server,sample] fix resource location if binary versioning is enabled the installation path was wrong. --- server/Sample/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/Sample/CMakeLists.txt b/server/Sample/CMakeLists.txt index 9cae9cba2..e23f65c82 100644 --- a/server/Sample/CMakeLists.txt +++ b/server/Sample/CMakeLists.txt @@ -48,9 +48,10 @@ if (WIN32) set ( SRCS ${SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) endif() -set(SAMPLE_RESOURCE_ROOT ${CMAKE_INSTALL_FULL_DATAROOTDIR}/FreeRDP/images) if (WITH_BINARY_VERSIONING) - string(APPEND SAMPLE_RESOURCE_ROOT "${PROJECT_VERSION_MAJOR}") + set(SAMPLE_RESOURCE_ROOT ${CMAKE_INSTALL_FULL_DATAROOTDIR}/FreeRDP${FREERDP_VERSION_MAJOR}/images) +else() + set(SAMPLE_RESOURCE_ROOT ${CMAKE_INSTALL_FULL_DATAROOTDIR}/FreeRDP/images) endif() set(SAMPLE_ICONS