2019-11-15 11:00:37 +01:00
|
|
|
diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
|
2021-01-16 12:46:26 +01:00
|
|
|
--- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100
|
|
|
|
|
+++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100
|
|
|
|
|
@@ -55,7 +47,7 @@
|
2019-11-15 11:00:37 +01:00
|
|
|
|
|
|
|
|
include_directories(${QT_INCLUDES})
|
|
|
|
|
|
|
|
|
|
-find_program(QT_QMAKE_EXECUTABLE qmake)
|
|
|
|
|
+find_program(QT_QMAKE_EXECUTABLE qmake-qt5)
|
|
|
|
|
set(_qmake_vars
|
|
|
|
|
QT_INSTALL_ARCHDATA
|
|
|
|
|
QT_INSTALL_BINS
|
2020-10-08 00:43:05 +02:00
|
|
|
diff -ur a/CMakeLists.txt b/CMakeLists.txt
|
2021-01-16 12:46:26 +01:00
|
|
|
--- a/CMakeLists.txt 2021-01-14 14:33:11.000000000 +0100
|
|
|
|
|
+++ b/CMakeLists.txt 2021-01-15 13:24:07.140841485 +0100
|
2020-10-08 00:43:05 +02:00
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
include(build/functions.cmake) # library of CMake functions ("fn__" namespace)
|
|
|
|
|
|
|
|
|
|
# Print Qt version or fail the build if Qt (qmake) is not in PATH.
|
|
|
|
|
-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake)
|
|
|
|
|
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5)
|
|
|
|
|
|
2021-01-16 12:46:26 +01:00
|
|
|
# Libraries linked via full path no longer produce linker search paths.
|
|
|
|
|
cmake_policy(SET CMP0003 NEW)
|
