From 672a158a0aadaa26f2a3b601f71d829c08fe9791 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sun, 14 Dec 2008 17:09:06 +0000 Subject: [PATCH] cmake: more install fixes, thx to Kornel Benko git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27871 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/Install.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index b3610e864c..983a1cda21 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -10,6 +10,8 @@ macro(lyx_install _parent_src_dir _dir _file_type) foreach(_current_dir ${ARGN}) file(GLOB files_list ${_parent_src_dir}/${_dir}/${_current_dir}/*.${_file_type}) list(REMOVE_ITEM files_list "${_parent_src_dir}/${_dir}/${_current_dir}/.svn") + list(REMOVE_ITEM files_list "${_parent_src_dir}/${_dir}/${_current_dir}/Makefile.in") + list(REMOVE_ITEM files_list "${_parent_src_dir}/${_dir}/${_current_dir}/Makefile.am") install(FILES ${files_list} DESTINATION ${_dir}/${_current_dir}) #message(STATUS "install ${_dir}/${_current_dir}: ${files_list} ") #message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${_dir}/${_current_dir}") @@ -29,7 +31,7 @@ lyx_install(${TOP_SRC_DIR}/lib doc/ja * clipart) lyx_install(${TOP_SRC_DIR}/lib doc/uk * clipart) lyx_install(${TOP_SRC_DIR}/lib examples * . ca cs da de es eu fr gl he hu it ja nl nb pl pt ro ru sk sl sv uk) lyx_install(${TOP_SRC_DIR}/lib fonts * .) -lyx_install(${TOP_SRC_DIR}/lib images * . math commands) +lyx_install(${TOP_SRC_DIR}/lib images * . math commands attic) lyx_install(${TOP_SRC_DIR}/lib kbd * .) lyx_install(${TOP_SRC_DIR}/lib layouts * .) lyx_install(${TOP_SRC_DIR}/lib lyx2lyx * .) @@ -40,7 +42,8 @@ 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/lyx2lyx/lyx2lyx DESTINATION lyx2lyx) +foreach(_file unicodesymbols encodings languages) install(FILES ${TOP_SRC_DIR}/lib/${_file} DESTINATION .) endforeach(_file) -- 2.39.2