Source: sonnet
Version: 5.74.0-2
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Thank you for applying my previous ftcbfs patch. In the mean time, a new
problem surfaced: sonnet installs parsetrigrams and fails when it goes
missing. However, the cross build no longer builds it. Please consider
applying the attached patch to always build parsetrigrams and thus
complete the installation.
Helmut
--- sonnet-5.74.0.orig/data/CMakeLists.txt
+++ sonnet-5.74.0/data/CMakeLists.txt
@@ -1,18 +1,18 @@
include(ECMMarkNonGuiExecutable)
-if(NOT CMAKE_CROSSCOMPILING)
- add_executable(parsetrigrams parsetrigrams.cpp)
- add_executable(gentrigrams gentrigrams.cpp)
+add_executable(parsetrigrams parsetrigrams.cpp)
+add_executable(gentrigrams gentrigrams.cpp)
- # Mark it as non-gui so we won't create an app bundle on Mac OS X
- ecm_mark_nongui_executable(parsetrigrams)
- ecm_mark_nongui_executable(gentrigrams)
+# Mark it as non-gui so we won't create an app bundle on Mac OS X
+ecm_mark_nongui_executable(parsetrigrams)
+ecm_mark_nongui_executable(gentrigrams)
- TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core)
- TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore)
- INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
- INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core)
+TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore)
+INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+if(NOT CMAKE_CROSSCOMPILING)
add_executable(KF5::parsetrigrams ALIAS parsetrigrams)
else()
if (NOT PARSETRIGRAMS_EXECUTABLE AND KF5_HOST_TOOLING)
