From: Peter Kümmel Date: Sun, 11 Jan 2009 18:50:24 +0000 (+0000) Subject: Kornel's patch X-Git-Tag: 2.0.0~7454 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=138d393a17ef64aa82c32cd7cb3f62532ab0e8be;p=features.git Kornel's patch development/cmake/Install.cmake Added directory scripts Corrected handling of directories. There may well be empty _dir_list. (if we search for e.g. lib/doc/en/clipart, there is nothing) development/cmake/lyx2lyx/CMakeLists.txt most ot the code moved to development/cmake/lyx2lyx/CMakeLists.txt, we include now this module. development/cmake/CMakeLists.txt add the subdirectory "scripts" git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28100 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 0f9141873e..8f84678158 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -350,10 +350,12 @@ if(NOT use_external_libintl) endif() add_subdirectory(src) +#include_directories(man doc) add_subdirectory(man) add_subdirectory(doc) if (UNIX) add_subdirectory(lyx2lyx) + add_subdirectory(scripts) endif() include(../Install) diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index 11dd6fd3e6..49f179cc44 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -49,13 +49,14 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type) endforeach(_dir) endmacro(lyx_install) + # language-specific-directories (like ca, de, es ...) are now globbed as "[a-z][a-z]" set(_all_languages "[a-z][a-z]") lyx_install(${TOP_SRC_DIR}/lib bind *.bind . ${_all_languages}) lyx_install(${TOP_SRC_DIR}/lib commands *.def .) -# this is handled in doc/CMakefile.txt +# this is handled in doc/CMakeLists.txt #lyx_install(${TOP_SRC_DIR}/lib doc *.lyx . ${_all_languages}) #lyx_install(${TOP_SRC_DIR}/lib doc *.txt . ${_all_languages}) lyx_install(${TOP_SRC_DIR}/lib doc * biblio clipart) @@ -68,7 +69,7 @@ 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 *.py .) -lyx_install(${TOP_SRC_DIR}/lib scripts * .) +lyx_install(${TOP_SRC_DIR}/lib scripts *.py .) lyx_install(${TOP_SRC_DIR}/lib templates * .) lyx_install(${TOP_SRC_DIR}/lib tex * .) lyx_install(${TOP_SRC_DIR}/lib ui * .)