Merge pull request #2223 from opentx/griebd/find_lupdate_executable_2222
[companion]CMake find QT lupdate. Fixes #2222.
This commit is contained in:
@@ -53,6 +53,14 @@ ELSE()
|
|||||||
MESSAGE( "PHONON not found!" )
|
MESSAGE( "PHONON not found!" )
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
MESSAGE( STATUS "Looking for QT lupdate " )
|
||||||
|
FIND_PACKAGE(Lupdate)
|
||||||
|
if( LUPDATE_FOUND )
|
||||||
|
MESSAGE( "QT lupdate: " ${LUPDATE_EXECUTABLE} )
|
||||||
|
ELSE()
|
||||||
|
MESSAGE( "QT lupdate not found!" )
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
COMMAND ${XSDCXX_EXECUTABLE} cxx-tree --root-element-all --generate-serialization --output-dir ${PROJECT_BINARY_DIR}/ ${PROJECT_SOURCE_DIR}/radio.xsd
|
COMMAND ${XSDCXX_EXECUTABLE} cxx-tree --root-element-all --generate-serialization --output-dir ${PROJECT_BINARY_DIR}/ ${PROJECT_SOURCE_DIR}/radio.xsd
|
||||||
OUTPUT ${PROJECT_BINARY_DIR}/radio.hxx ${PROJECT_BINARY_DIR}/radio.cxx
|
OUTPUT ${PROJECT_BINARY_DIR}/radio.hxx ${PROJECT_BINARY_DIR}/radio.cxx
|
||||||
@@ -392,15 +400,16 @@ ADD_CUSTOM_TARGET( stamp
|
|||||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp
|
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp
|
||||||
DEPENDS ${CMAKE_BINARY_DIR}/version.h )
|
DEPENDS ${CMAKE_BINARY_DIR}/version.h )
|
||||||
|
|
||||||
IF(WIN32)
|
IF( LUPDATE_FOUND )
|
||||||
ADD_CUSTOM_TARGET( translations
|
ADD_CUSTOM_TARGET( translations
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
COMMAND lupdate ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
|
COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -ts ${companion_TS}
|
||||||
ELSE( )
|
)
|
||||||
|
ELSE()
|
||||||
ADD_CUSTOM_TARGET( translations
|
ADD_CUSTOM_TARGET( translations
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
COMMAND echo "Sorry, QT lupdate was not found."
|
||||||
COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
|
)
|
||||||
ENDIF( )
|
ENDIF()
|
||||||
|
|
||||||
SET(CPACK_PACKAGE_NAME "COMPANION")
|
SET(CPACK_PACKAGE_NAME "COMPANION")
|
||||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
|
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Locate lupdate binary from QT
|
||||||
|
|
||||||
|
# This module defines
|
||||||
|
# LUPDATE_EXECUTABLE, where is QT lupdate
|
||||||
|
# LUPDATE_FOUND, if false, don't try to use lupdate
|
||||||
|
|
||||||
|
FIND_PROGRAM( LUPDATE_EXECUTABLE
|
||||||
|
NAMES
|
||||||
|
lupdate lupdate-qt4
|
||||||
|
)
|
||||||
|
|
||||||
|
MESSAGE( STATUS ${LUPDATE_EXECUTABLE} )
|
||||||
|
|
||||||
|
# if the program is found then we have it
|
||||||
|
IF( LUPDATE_EXECUTABLE )
|
||||||
|
SET( LUPDATE_FOUND "YES" )
|
||||||
|
ENDIF( LUPDATE_EXECUTABLE )
|
||||||
|
|
||||||
|
MARK_AS_ADVANCED( LUPDATE_EXECUTABLE )
|
||||||
Reference in New Issue
Block a user