From 5e4f2190a9eb73064aa9cea93f7326d101039ea6 Mon Sep 17 00:00:00 2001 From: tresf Date: Mon, 7 Mar 2016 01:02:47 -0500 Subject: [PATCH] Fix locale generation for win32 builds Closes #2577 --- .travis/linux.win32.install.sh | 2 +- data/locale/CMakeLists.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis/linux.win32.install.sh b/.travis/linux.win32.install.sh index 5d61807d9..fa910787a 100644 --- a/.travis/linux.win32.install.sh +++ b/.travis/linux.win32.install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PACKAGES="nsis cloog-isl libmpc2 mingw32 +PACKAGES="nsis cloog-isl libmpc2 qt4-linguist-tools mingw32 mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt index 8454e9d83..37fb24e36 100644 --- a/data/locale/CMakeLists.txt +++ b/data/locale/CMakeLists.txt @@ -3,6 +3,17 @@ if (QT5) set (QT_LRELEASE_EXECUTABLE "${Qt5_LRELEASE_EXECUTABLE}") endif () +IF(QT_LUPDATE_EXECUTABLE STREQUAL "") + EXECUTE_PROCESS(COMMAND "lupdate" "--help" RESULT_VARIABLE LUPDATE_FALLBACK OUTPUT_QUIET) + IF(LUPDATE_FALLBACK EQUAL 0) + SET(QT_LUPDATE_EXECUTABLE lupdate) + SET(QT_LRELEASE_EXECUTABLE lrelease) + ELSE() + MESSAGE(FATAL_ERROR "Cannot generate locales") + ENDIF() +ENDIF() + + # # rules for building localizations #