Am Wed, 25 Mar 2020 14:44:09 +0100 schrieb Kornel Benko <[email protected]>:
> > Nice! Can we add "Qt version" to the CMake output? In case it is
> > helpful, here are my current outputs for master with CMake and with
> > autotools:
> >
> >
>
> The QT-version and 'LyX files dir' is also at Help->About->Version. Why
> should it go
> here too?
>
> Kornel
OK, the 'LyX files dir' and 'LyX binary dir' are referencing paths in the
(later)
installed version. So this is different to actual used sysdir and lyx-exe.
But the qt-version (installed +compiled) is already there.
Kornel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 202e341745..bd4e16866a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1094,10 +1094,13 @@ set(VERSION_INFO "${VERSION_INFO}\\n C++ Compiler flags: ${CMAKE_CXX_FLAGS
if (LYX_DEBUG)
set(VERSION_INFO "${VERSION_INFO}\\n C++ Compiler user flags: ${CMAKE_CXX_FLAGS_DEBUG}")
else()
set(VERSION_INFO "${VERSION_INFO}\\n C++ Compiler user flags: ${CMAKE_CXX_FLAGS_RELEASE}")
endif()
+get_data_destination(dest_data)
+set(VERSION_INFO "${VERSION_INFO}\\n LyX binary dir: ${CMAKE_INSTALL_PREFIX}/${LYX_UTILITIES_INSTALL_PATH}")
+set(VERSION_INFO "${VERSION_INFO}\\n LyX files dir: ${CMAKE_INSTALL_PREFIX}/${dest_data}")
configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
pgpN90kt4YKcG.pgp
Description: Digitale Signatur von OpenPGP
-- lyx-devel mailing list [email protected] http://lists.lyx.org/mailman/listinfo/lyx-devel
