Skip to content

Commit

Permalink
Merge pull request input-leap#1885 from sithlord48/optional_flatpak
Browse files Browse the repository at this point in the history
Deployment on Linux: Avoid deploying Flatpak file unless in a Flatpak
  • Loading branch information
p12tic authored Mar 8, 2024
2 parents b327bb1 + 54f1eb2 commit 9c88618
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ option(INPUTLEAP_BUILD_TESTS "Build the tests" ON)
option(INPUTLEAP_USE_EXTERNAL_GTEST "Use external installation of Google Test framework" OFF)
option(INPUTLEAP_BUILD_X11 "Build with XWindows support" ON)
option(INPUTLEAP_BUILD_LIBEI "Build with libei support" OFF)

option(INPUTLEAP_DEPLOY_FLATPAK_SCRIPT "Deploy Flatpak script [Expermental]" OFF)
set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -199,10 +199,13 @@ if (UNIX)
" HAVE_LIBPORTAL_OUTPUT_NONE)
cmake_pop_check_state()

# Flatpak bits
install(FILES "dist/flatpak/input-leap-flatpak"
DESTINATION bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
if(INPUTLEAP_DEPLOY_FLATPAK_SCRIPT)
# Flatpak bits
install(FILES "dist/flatpak/input-leap-flatpak"
DESTINATION bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
endif()

check_include_files ("dns_sd.h" HAVE_DNSSD)
Expand Down

0 comments on commit 9c88618

Please sign in to comment.