Skip to content

Commit

Permalink
Simplify include(...) statements
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed May 18, 2024
1 parent 513b0ae commit cbd9c1a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/linux/LinuxDeploy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ if(CPACK_DEBUG)
unset(OUTPUT_QUIET)
endif()

include("${CPACK_SOURCE_DIR}/cmake/modules/DownloadBinary.cmake")
include("${CPACK_SOURCE_DIR}/cmake/modules/CreateSymlink.cmake")
include(DownloadBinary)
include(CreateSymlink)

# Cleanup CPack "External" json files, old AppImage files
file(GLOB cleanup "${CPACK_BINARY_DIR}/lmms-*.json"
Expand Down
2 changes: 1 addition & 1 deletion cmake/linux/LinuxDeployQt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if(CPACK_DEBUG)
set(COMMAND_ECHO STDOUT)
endif()

include("${CPACK_SOURCE_DIR}/cmake/modules/CreateSymlink.cmake")
include(CreateSymlink)

set(LINUXDEPLOYQT_URL "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/")
string(APPEND LINUXDEPLOYQT_URL "linuxdeployqt-continuous-${CPACK_TARGET_ARCH}.AppImage")
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/DownloadBinary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ macro(download_binary RESULT_VARIABLE _url _name _prepend_to_path)
# We need to create a subdirectory for this binary and symlink it's AppRun to where it's expected
if(_${RESULT_VARIABLE}_NEEDS_FUSE AND NOT _FUSE_FOUND)
if(NOT COMMAND create_symlink)
include("${CMAKE_SOURCE_DIR}/cmake/modules/CreateSymlink.cmake")
include(CreateSymlink)
endif()

# extract appimage
Expand Down

0 comments on commit cbd9c1a

Please sign in to comment.