LoweBowe
/
MuseScore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake/WiX: cleanup regarding MUSESCORE_EXECUTABLE_NAME

This commit is contained in:
Casper Jeukendrup 2023-10-08 01:43:36 +02:00
parent 4d645f55d5
commit 1f7561d689
No known key found for this signature in database
GPG Key ID: 6C571BEF59E722DD
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/SetupWindowsPackaging.cmake
View File

@ -41,9 +41,9 @@ endif(MUSESCORE_UNSTABLE)
set(CPACK_PACKAGE_FILE_NAME "${MUSESCORE_NAME}-${MUSESCORE_VERSION}${git_date_string}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${MUSESCORE_NAME_VERSION})
set(MSCORE_EXECUTABLE_NAME ${MUSESCORE_NAME}${MUSESCORE_VERSION_MAJOR})
set(CPACK_PACKAGE_EXECUTABLES "${MSCORE_EXECUTABLE_NAME}" "${MUSESCORE_NAME_VERSION}") # exe name, label
set(CPACK_CREATE_DESKTOP_LINKS "${MSCORE_EXECUTABLE_NAME}" "${MUSESCORE_NAME_VERSION}") # exe name, label
set(MUSESCORE_EXECUTABLE_NAME ${MUSESCORE_NAME}${MUSESCORE_VERSION_MAJOR})
set(CPACK_PACKAGE_EXECUTABLES "${MUSESCORE_EXECUTABLE_NAME}" "${MUSESCORE_NAME_VERSION}") # exe name, label
set(CPACK_CREATE_DESKTOP_LINKS "${MUSESCORE_EXECUTABLE_NAME}" "${MUSESCORE_NAME_VERSION}") # exe name, label
# Wix-specific options
set(CPACK_GENERATOR "WIX")
@ -75,9 +75,10 @@ set(CPACK_WIX_EXTENSIONS "WixUtilExtension")
# Extra CPack variables
list(APPEND CPACK_WIX_CANDLE_EXTRA_FLAGS
"-dCPACK_PACKAGE_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR}"
"-dMUSESCORE_NAME_VERSION=${MUSESCORE_NAME_VERSION}"
"-dMUSESCORE_EXECUTABLE_NAME=${MUSESCORE_EXECUTABLE_NAME}"
"-dMUSESCORE_VERSION_LABEL=${MUSESCORE_VERSION_LABEL}"
"-dCPACK_PACKAGE_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR}"
)
if (MUSESCORE_IS_PRERELEASE)

2
build/packaging/WIX.template.in
View File

@ -4,8 +4,8 @@
<?define ProdName="$(var.MUSESCORE_NAME_VERSION)"?>
<?define ShortProdName="$(var.CPACK_PACKAGE_NAME)$(var.CPACK_PACKAGE_VERSION_MAJOR)$(var.MUSESCORE_VERSION_LABEL)"?>
<?define ExeName="$(var.CPACK_PACKAGE_NAME)$(var.CPACK_PACKAGE_VERSION_MAJOR).exe"?>
<?define ExeKey="$(var.ShortProdName).exe"?>
<?define ExeName="$(var.MUSESCORE_EXECUTABLE_NAME).exe"?>
<?define RegistryRoot="HKMU"?> <!--HKCU / HKLM-->
<?if "$(var.MUSESCORE_VERSION_LABEL)" != ""?>

9
src/app/CMakeLists.txt
View File

@ -32,7 +32,6 @@ set(EXECUTABLE_NAME mscore)
###########################################
include(GetPlatformInfo)
if (OS_IS_WIN)
set(MSCORE_OUTPUT_NAME ${MUSESCORE_NAME}${MUSESCORE_VERSION_MAJOR})
include(GetCompilerInfo)
@ -271,11 +270,11 @@ if (OS_IS_WASM)
endif(OS_IS_WASM)
if (MSCORE_OUTPUT_NAME)
set(MSCORE_EXECUTABLE_NAME ${MSCORE_OUTPUT_NAME})
set(MUSESCORE_EXECUTABLE_NAME ${MSCORE_OUTPUT_NAME})
else (MSCORE_OUTPUT_NAME)
set(MSCORE_EXECUTABLE_NAME ${EXECUTABLE_NAME})
set(MUSESCORE_EXECUTABLE_NAME ${EXECUTABLE_NAME})
endif (MSCORE_OUTPUT_NAME)
set(MSCORE_EXECUTABLE_NAME "${MSCORE_EXECUTABLE_NAME}" PARENT_SCOPE)
set(MUSESCORE_EXECUTABLE_NAME "${MUSESCORE_EXECUTABLE_NAME}" PARENT_SCOPE)
###########################################
# Link
@ -498,7 +497,7 @@ if (MSVC)
# Set the debugging properties for the "mscore" project.
file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/bin" VS_DEBUGGER_WORKING_DIRECTORY)
if (NOT ${CMAKE_VERSION} VERSION_LESS "3.12.0")
set_target_properties(${EXECUTABLE_NAME} PROPERTIES VS_DEBUGGER_COMMAND "${VS_DEBUGGER_WORKING_DIRECTORY}\\${MSCORE_EXECUTABLE_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
set_target_properties(${EXECUTABLE_NAME} PROPERTIES VS_DEBUGGER_COMMAND "${VS_DEBUGGER_WORKING_DIRECTORY}\\${MUSESCORE_EXECUTABLE_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
endif ()
if (NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0")
set_target_properties(${EXECUTABLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${VS_DEBUGGER_WORKING_DIRECTORY}")