diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dce12d8..4d8cd45e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ list(APPEND X_TOOLS_QT_COMPONENTS Network) list(APPEND X_TOOLS_QT_COMPONENTS LinguistTools) # Qt6 is preferred, but Qt5 is also supported -find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS}) +find_package(Qt NAMES Qt5 Qt6 REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS}) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS}) # -------------------------------------------------------------------------------------------------- @@ -286,8 +286,7 @@ endif() # Make package for linux(deb or appimage) if(LINUX) include(cmake/linux/linux.cmake) - x_tools_make_package(xTools "x-tools" "xTools" ${X_TOOLS_LATEST_GIT_TAG} FALSE) - x_tools_make_package(xTools "x-tools" "xTools" ${X_TOOLS_LATEST_GIT_TAG} TRUE) + x_build_deb(xTools "x-tools" "xTools" ${X_TOOLS_LATEST_GIT_TAG} ${CMAKE_SOURCE_DIR}/xTools.png) endif() # -------------------------------------------------------------------------------------------------- diff --git a/cmake/linux/linux.cmake b/cmake/linux/linux.cmake index a70e1949..a41c05b5 100644 --- a/cmake/linux/linux.cmake +++ b/cmake/linux/linux.cmake @@ -1,4 +1,4 @@ -function(x_tools_make_package target packetName friendlyName version is_deb) +function(x_build_deb target packetName friendlyName version icon) file(GLOB_RECURSE RES_FILES ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/*) # target to lower case @@ -6,24 +6,15 @@ function(x_tools_make_package target packetName friendlyName version is_deb) # Remove all spaces string(REGEX REPLACE " " "" lower_target ${lower_target}) - set(package_type "appimage") - if(${is_deb}) - set(package_type "deb") - endif() - set(args "-DargTarget=${target}") list(APPEND args "-DargPacketName=${packetName}") list(APPEND args "-DargFriendlyName=${friendlyName}") list(APPEND args "-DargVersion=${version}") - if(is_deb) - list(APPEND args "-DargWorkingDir=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}-deb") - else() - list(APPEND args "-DargWorkingDir=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}-appimage") - endif() + list(APPEND args "-DargWorkingDir=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}-deb") + list(APPEND args "-DargIcon=${icon}") list(APPEND args "-DargLowerTargetName=${lower_target}") list(APPEND args "-DargTool=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/tools/linuxdeployqt") list(APPEND args "-DargSrcDir=${CMAKE_SOURCE_DIR}") - list(APPEND args "-DargPackageType=${package_type}") list(APPEND args "-DargQmakePath=${QT_DIR}/../../../bin/qmake") list(APPEND args "-DargTargetFile=$") list(APPEND args "-DargAssetName=${X_ASSET_NAME}") @@ -33,7 +24,7 @@ function(x_tools_make_package target packetName friendlyName version is_deb) endforeach() # cmake-format: off - add_custom_target(${target}_${package_type} + add_custom_target(${target}_linux COMMAND ${CMAKE_COMMAND} ${args} -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/linuxscript.cmake SOURCES ${RES_FILES}) # cmake-format: on diff --git a/xTools.png b/xTools.png index 25faaf32..c1146360 100644 Binary files a/xTools.png and b/xTools.png differ