File fix-build.patch of Package companion

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build.patch of Package companion

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f5d287f0..1fabc89ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ if(Qt5Core_FOUND)
   set(QT_LIB_DIR ${qt_core_path} CACHE PATH "Path to Qt libraries (.dll|.framework|.so).")
   find_path(QT_BIN_DIR NAMES "qmake" "qmake.exe" HINTS "${CMAKE_PREFIX_PATH}/bin" "${qt_core_path}/../bin" "${qt_core_path}" DOC "Path to Qt binaries (qmake, lupdate, etc.).")
   find_program(QT_QMAKE_EXECUTABLE qmake HINTS "${QT_BIN_DIR}" DOC "Location of qmake program.")
-  find_program(QT_LUPDATE_EXECUTABLE lupdate HINTS "${QT_BIN_DIR}" DOC "Location of Qt's 'lupdate' program for updating translation files.")
+  find_program(QT_LUPDATE_EXECUTABLE lupdate-qt5 HINTS "${QT_BIN_DIR}" DOC "Location of Qt's 'lupdate' program for updating translation files.")
 
   # Try to find Qt translations
   if(QT_QMAKE_EXECUTABLE)
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index bfca8706e..9ba7a9a53 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -459,9 +459,9 @@ if(NOT MSVC)
   if(ARCH STREQUAL ARM)
 
     enable_language(ASM)
-    set(CMAKE_C_COMPILER arm-none-eabi-gcc)
-    set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
-    set(CMAKE_ASM_COMPILER arm-none-eabi-as)
+    set(CMAKE_C_COMPILER arm-suse-linux-gnueabi-gcc)
+    set(CMAKE_CXX_COMPILER arm-suse-linux-gnueabi-g++)
+    set(CMAKE_ASM_COMPILER arm-suse-linux-gnueabi-as)
 
     set(CMAKE_SYSTEM_NAME Generic)
     set(CMAKE_SYSTEM_VERSION 1)

Places

File fix-build.patch of Package companion

Places