fly/flightgear
1
0
Fork 0
Code Activity

Fix CMake dependencies for translations

Browse source 
When only building the fgfs target (which IDEs tend to do), we didn’t
update the translations. Add an explicit dependency to remedy this.
This commit is contained in:
James Turner 2018-08-28 12:04:56 +01:00
parent eaa2ed5cbb
commit f4b98cf204
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/CMakeLists.txt
View file

@ -125,6 +125,7 @@ if (HAVE_QT)
set_property(TARGET fglauncher PROPERTY AUTOMOC ON) set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
add_dependencies(fglauncher fgfs_qm_files)
add_library(fgqmlui QQuickDrawable.cxx add_library(fgqmlui QQuickDrawable.cxx
QQuickDrawable.hxx QQuickDrawable.hxx
@ -161,6 +162,8 @@ if (HAVE_QT)
set_property(TARGET fgqmlui PROPERTY AUTOMOC ON) set_property(TARGET fgqmlui PROPERTY AUTOMOC ON)
target_link_libraries(fgqmlui Qt5::Quick Qt5::Network Qt5::Qml SimGearCore) target_link_libraries(fgqmlui Qt5::Quick Qt5::Network Qt5::Qml SimGearCore)
target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
add_dependencies(fgqmlui fgfs_qm_files)
endif() endif()

2
src/Main/CMakeLists.txt
View file

@ -88,6 +88,8 @@ add_executable(fgfs
) )
add_dependencies(fgfs buildId) add_dependencies(fgfs buildId)
# explicitly disable automoc for main fgfs target
set_property(TARGET fgfs PROPERTY AUTOMOC OFF)
# MacOSX bundle packaging # MacOSX bundle packaging
if(APPLE) if(APPLE)