[LyX/master] Amend(2) 4b052dec: Do not use CMAKE_INSTALL_PREFIX

Kornel Benko kornel at lyx.org
Mon Apr 13 19:58:41 UTC 2020


commit 66142c7d08230b6a414d1f065992661a012d8b91
Author: Kornel Benko <kornel at lyx.org>
Date:   Mon Apr 13 22:18:47 2020 +0200

    Amend(2) 4b052dec: Do not use CMAKE_INSTALL_PREFIX
    
    On Windows this leads to duplicated use of 'LYX_INSTALLED' in the installed paths.
    Spotted by Eugene.
---
 3rdparty/dtl/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/3rdparty/dtl/CMakeLists.txt b/3rdparty/dtl/CMakeLists.txt
index 3b31972..5835495 100644
--- a/3rdparty/dtl/CMakeLists.txt
+++ b/3rdparty/dtl/CMakeLists.txt
@@ -35,5 +35,5 @@ endforeach()
 # Install dtl tools in this directory to omit possible packaging conflicts
 # if installing multiple lyx versions, each with own dtl executables
 get_data_destination(dest_data)
-install(TARGETS ${targets} DESTINATION "${CMAKE_INSTALL_PREFIX}/${dest_data}/extratools")
+install(TARGETS ${targets} DESTINATION "${dest_data}/extratools")
 install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1)


More information about the lyx-cvs mailing list