smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: resolve cmake cap nits

Browse source 
Fixes: #7727
This commit is contained in:
sithlord48 2024-10-17 08:21:29 -04:00 committed by Nick Bolton
parent 219958898e
commit 01d67e4614
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cmake/Packaging.cmake
View file

@ -9,6 +9,7 @@
# #
macro(configure_packaging) macro(configure_packaging)
message(VERBOSE "Configuring Packaging")
set(DESKFLOW_PROJECT_RES_DIR ${PROJECT_SOURCE_DIR}/res) set(DESKFLOW_PROJECT_RES_DIR ${PROJECT_SOURCE_DIR}/res)
configure_file(${CMAKE_SOURCE_DIR}/cmake/CPackOptions.cmake.in configure_file(${CMAKE_SOURCE_DIR}/cmake/CPackOptions.cmake.in
${CMAKE_BINARY_DIR}/cmake/CPackOptions.cmake @ONLY) ${CMAKE_BINARY_DIR}/cmake/CPackOptions.cmake @ONLY)
@ -36,9 +37,8 @@ macro(configure_packaging)
set(OS_STRING ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) set(OS_STRING ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
endif() endif()
# cmake-format: off set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${OS_STRING}")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${OS_STRING}") message(STATUS "Package Basename: ${CPACK_PACKAGE_NAME}")
# cmake-format: on
include(CPack) include(CPack)
else() else()
@ -52,8 +52,6 @@ endmacro()
# #
macro(configure_windows_packaging) macro(configure_windows_packaging)
message(VERBOSE "Configuring Windows installer")
set(QT_PATH $ENV{CMAKE_PREFIX_PATH}) set(QT_PATH $ENV{CMAKE_PREFIX_PATH})
set(DESKFLOW_MSI_64_GUID set(DESKFLOW_MSI_64_GUID
@ -80,8 +78,6 @@ endmacro()
# #
macro(configure_mac_packaging) macro(configure_mac_packaging)
message(VERBOSE "Configuring macOS app bundle")
set(CMAKE_INSTALL_RPATH set(CMAKE_INSTALL_RPATH
"@loader_path/../Libraries;@loader_path/../Frameworks") "@loader_path/../Libraries;@loader_path/../Frameworks")
set(DESKFLOW_BUNDLE_SOURCE_DIR set(DESKFLOW_BUNDLE_SOURCE_DIR
@ -109,7 +105,7 @@ macro(configure_linux_package_name)
OUTPUT_VARIABLE _DISTRO_NAME OUTPUT_VARIABLE _DISTRO_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\"" "" DISTRO_NAME "${_DISTRO_NAME}") string(REPLACE "\"" "" DISTRO_NAME "${_DISTRO_NAME}")
message(STATUS "DISTRO NAME: ${DISTRO_NAME}") message(STATUS "Distro Name: ${DISTRO_NAME}")
execute_process( execute_process(
COMMAND bash "-c" COMMAND bash "-c"
@ -117,7 +113,7 @@ macro(configure_linux_package_name)
OUTPUT_VARIABLE _DISTRO_LIKE OUTPUT_VARIABLE _DISTRO_LIKE
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\"" "" DISTRO_LIKE "${_DISTRO_LIKE}") string(REPLACE "\"" "" DISTRO_LIKE "${_DISTRO_LIKE}")
message(STATUS "DISTRO LIKE: ${DISTRO_LIKE}") message(STATUS "Distro Like: ${DISTRO_LIKE}")
execute_process( execute_process(
COMMAND COMMAND
@ -126,7 +122,7 @@ macro(configure_linux_package_name)
OUTPUT_VARIABLE _DISTRO_CODENAME OUTPUT_VARIABLE _DISTRO_CODENAME
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\"" "" DISTRO_CODENAME "${_DISTRO_CODENAME}") string(REPLACE "\"" "" DISTRO_CODENAME "${_DISTRO_CODENAME}")
message(STATUS "DISTRO CODENAME: ${DISTRO_CODENAME}") message(STATUS "Distro Codename: ${DISTRO_CODENAME}")
execute_process( execute_process(
COMMAND bash "-c" COMMAND bash "-c"
@ -134,7 +130,7 @@ macro(configure_linux_package_name)
OUTPUT_VARIABLE _DISTRO_VERSION_ID OUTPUT_VARIABLE _DISTRO_VERSION_ID
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}") string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}")
message(STATUS "DISTRO ID: ${DISTRO_VERSION_ID}") message(STATUS "Distro ID: ${DISTRO_VERSION_ID}")
# Set Run Attempt portion of package name # Set Run Attempt portion of package name
# GITHUB_RUN_ATTEMPT is set by GITHUB when a job is run # GITHUB_RUN_ATTEMPT is set by GITHUB when a job is run
@ -152,7 +148,7 @@ macro(configure_linux_package_name)
"${PACKAGE_BUILD_ATTEMPT}~${DISTRO_CODENAME}") "${PACKAGE_BUILD_ATTEMPT}~${DISTRO_CODENAME}")
endif() endif()
set(CPACK_GENERATOR "DEB") set(CPACK_GENERATOR "DEB")
message(STATUS "DEB RELEASE INFO: ${CPACK_DEBIAN_PACKAGE_RELEASE}") message(STATUS "DEB Revision: ${CPACK_DEBIAN_PACKAGE_RELEASE}")
endif() endif()
check_is_rpm() check_is_rpm()
@ -172,14 +168,10 @@ macro(configure_linux_package_name)
endif() endif()
set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}") set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS "OS INFO: ${OS_STRING}")
endmacro() endmacro()
macro(configure_linux_packaging) macro(configure_linux_packaging)
message(VERBOSE "Configuring Linux packaging")
# Gather distro info # Gather distro info
# This is used in package names # This is used in package names
configure_linux_package_name() configure_linux_package_name()
@ -291,7 +283,7 @@ macro(check_is_rpm)
endif() endif()
set(CPACK_GENERATOR "RPM") set(CPACK_GENERATOR "RPM")
message(STATUS "RPM RELEASE INFO: ${CPACK_RPM_PACKAGE_RELEASE}") message(STATUS "RPM Revision: ${CPACK_RPM_PACKAGE_RELEASE}")
endif() endif()
endmacro() endmacro()