From ad175314c538acbe45ab59ca63c6f9ff6e80f64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Tue, 9 Dec 2008 20:13:04 +0000 Subject: [PATCH] cmake: fix install rules git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27828 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/Install.cmake | 13 ++++++++++--- development/cmake/src/tex2lyx/CMakeLists.txt | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index 4629d7e00f..e96e1c25b5 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -1,8 +1,10 @@ # TODO: set correct path #set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) -# the macro scans the directories "_parent_src_dir/_dir/dir_item" for *._type files -# and installs the files in CMAKE_INSTALL_PREFIX/dir_item +message(STATUS "installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX") + +# the macro scans the directories "_parent_src_dir/_dir/_current_dir" for *._file_type files +# and installs the files in CMAKE_INSTALL_PREFIX/_current_dir # dir_item is on item of the remaining arguments macro(lyx_install _parent_src_dir _dir _file_type) foreach(_current_dir ${ARGN}) @@ -30,9 +32,14 @@ lyx_install(${TOP_SRC_DIR}/lib scripts * .) lyx_install(${TOP_SRC_DIR}/lib templates * .) lyx_install(${TOP_SRC_DIR}/lib tex * .) lyx_install(${TOP_SRC_DIR}/lib ui * .) +lyx_install(${TOP_SRC_DIR}/lib . * .) +# TODO also get dot-less filenames in lyx_install +foreach(_file unicodesymbols encodings languages lyx2lyx/lyx2lyx) + install(FILES ${TOP_SRC_DIR}/lib/${_file} DESTINATION .) +endforeach(_file) - + # diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt index 257c3fd1cf..476a1feac3 100644 --- a/development/cmake/src/tex2lyx/CMakeLists.txt +++ b/development/cmake/src/tex2lyx/CMakeLists.txt @@ -73,3 +73,5 @@ endif() project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers) +install(TARGETS tex2lyx DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +