From 0dc1bdbb68003e4508c1006bcd9bd5aacd7ab8bf Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 30 Sep 2018 21:30:56 -0400 Subject: [PATCH] Minor cmake fixes (#4636) Minor cmake fixes --- cmake/modules/CheckSubmodules.cmake | 2 +- data/locale/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/modules/CheckSubmodules.cmake b/cmake/modules/CheckSubmodules.cmake index 55c0381b8..38717f18e 100644 --- a/cmake/modules/CheckSubmodules.cmake +++ b/cmake/modules/CheckSubmodules.cmake @@ -18,7 +18,7 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # Files which confirm a successful clone -SET(VALID_CRUMBS "CMakeLists.txt;Makefile;Makefile.in;Makefile.am;configure.ac;configure.py;autogen.sh;.gitignore") +SET(VALID_CRUMBS "CMakeLists.txt;Makefile;Makefile.in;Makefile.am;configure.ac;configure.py;autogen.sh;.gitignore;LICENSE;Home.md") # Try and use the specified shallow clone on submodules, if supported SET(DEPTH_VALUE 100) diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt index 9a7726406..9cb25f426 100644 --- a/data/locale/CMakeLists.txt +++ b/data/locale/CMakeLists.txt @@ -2,12 +2,13 @@ SET(QT_LUPDATE_EXECUTABLE "${Qt5_LUPDATE_EXECUTABLE}") SET(QT_LRELEASE_EXECUTABLE "${Qt5_LRELEASE_EXECUTABLE}") IF(QT_LUPDATE_EXECUTABLE STREQUAL "") - EXECUTE_PROCESS(COMMAND "lupdate" "--help" RESULT_VARIABLE LUPDATE_FALLBACK OUTPUT_QUIET) + 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") + MESSAGE(WARNING "Cannot generate locales") + RETURN() ENDIF() ENDIF()