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
This commit is contained in:
Peter Kümmel 2009-01-11 18:50:24 +00:00
parent ed50dbfe0f
commit 138d393a17
2 changed files with 5 additions and 2 deletions

View File

@ -350,10 +350,12 @@ if(NOT use_external_libintl)
endif() endif()
add_subdirectory(src) add_subdirectory(src)
#include_directories(man doc)
add_subdirectory(man) add_subdirectory(man)
add_subdirectory(doc) add_subdirectory(doc)
if (UNIX) if (UNIX)
add_subdirectory(lyx2lyx) add_subdirectory(lyx2lyx)
add_subdirectory(scripts)
endif() endif()
include(../Install) include(../Install)

View File

@ -49,13 +49,14 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
endforeach(_dir) endforeach(_dir)
endmacro(lyx_install) endmacro(lyx_install)
# language-specific-directories (like ca, de, es ...) are now globbed as "[a-z][a-z]" # language-specific-directories (like ca, de, es ...) are now globbed as "[a-z][a-z]"
set(_all_languages "[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 bind *.bind . ${_all_languages})
lyx_install(${TOP_SRC_DIR}/lib commands *.def .) 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 *.lyx . ${_all_languages})
#lyx_install(${TOP_SRC_DIR}/lib doc *.txt . ${_all_languages}) #lyx_install(${TOP_SRC_DIR}/lib doc *.txt . ${_all_languages})
lyx_install(${TOP_SRC_DIR}/lib doc * biblio clipart) 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 kbd * .)
lyx_install(${TOP_SRC_DIR}/lib layouts * .) lyx_install(${TOP_SRC_DIR}/lib layouts * .)
lyx_install(${TOP_SRC_DIR}/lib lyx2lyx *.py .) 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 templates * .)
lyx_install(${TOP_SRC_DIR}/lib tex * .) lyx_install(${TOP_SRC_DIR}/lib tex * .)
lyx_install(${TOP_SRC_DIR}/lib ui * .) lyx_install(${TOP_SRC_DIR}/lib ui * .)