From e11711d71e540ba2bf919aaf6abc1aecc5233f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 6 Apr 2018 03:15:19 +0200 Subject: snap: use proper snap dir when inside snapcraft --- snap/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'snap') diff --git a/snap/CMakeLists.txt b/snap/CMakeLists.txt index dfefff2f9..b0a21848d 100644 --- a/snap/CMakeLists.txt +++ b/snap/CMakeLists.txt @@ -37,7 +37,14 @@ if(NOT ${GIT_REVISION} STREQUAL ${REMMINA_VERSION_SUFFIX} AND set(SNAP_VERSION ${SNAP_VERSION}+git${GIT_REVISION}) endif() -set(SNAP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +if(DEFINED ENV{SNAPCRAFT_PROJECT_NAME}) + # We're building in snapcraft so, the source dir will be + # parts/remmina/src + set(SNAP_DIR ${CMAKE_SOURCE_DIR}/../../../snap) +else() + set(SNAP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +endif() + set(SNAP_GUI_DIR ${SNAP_DIR}/gui) file(MAKE_DIRECTORY ${SNAP_GUI_DIR}) @@ -47,11 +54,6 @@ file(RELATIVE_PATH CMAKE_SOURCE_DIR_RELATIVE ${SNAP_DIR} configure_file(${SNAP_DIR}/SNAP_VERSION.in ${SNAP_DIR}/SNAP_VERSION @ONLY) -set(REMMINA_BINARY_PATH "remmina") -set(REMMINA_ICON "\${SNAP}/meta/gui/icon.svg") -configure_file(${CMAKE_SOURCE_DIR}/remmina/desktop/remmina.desktop.in - ${SNAP_GUI_DIR}/${UNIQUE_APPNAME}.desktop @ONLY) - configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${SNAP_GUI_DIR}/license.txt COPYONLY) -- cgit v1.2.3