anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kornel: Moved handling of for lyx2lyx created files to lyx2lyx/CMakeLists.txt

Browse Source 
Installation of executabe lyx2lyx
		creation and installation of lyx2lyx_version.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28241 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2009-01-18 14:45:57 +00:00
parent d87030a353
commit 60ce0b3226
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/cmake/CMakeLists.txt
View File

@ -335,10 +335,6 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
find_package(ICONV REQUIRED) find_package(ICONV REQUIRED)
add_definitions(-DHAVE_ICONV=1) add_definitions(-DHAVE_ICONV=1)
#TODO: insource is not the best place
configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in
${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py)
include_directories( include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${TOP_SRC_DIR}/src ${TOP_SRC_DIR}/src
@ -352,10 +348,8 @@ add_subdirectory(src)
add_subdirectory(man) add_subdirectory(man)
add_subdirectory(doc) add_subdirectory(doc)
if (UNIX) add_subdirectory(lyx2lyx)
add_subdirectory(lyx2lyx) add_subdirectory(scripts)
add_subdirectory(scripts)
endif()
include(../Install) include(../Install)

8
development/cmake/Install.cmake
View File

@ -18,10 +18,10 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
foreach(_glob_dir ${ARGN}) foreach(_glob_dir ${ARGN})
file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir}) file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})
if(NOT _dir_list) if(NOT _dir_list)
if(_glob_dir STREQUAL ".") if(_glob_dir STREQUAL ".")
set(_dir_list ${_parent_src_dir}/${_dir}/.) set(_dir_list ${_parent_src_dir}/${_dir}/.)
endif() endif()
endif() endif()
#message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ") #message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ")
foreach(_current_dir ${_dir_list}) foreach(_current_dir ${_dir_list})
file(GLOB _item_list ${_current_dir}/${_file_type}) file(GLOB _item_list ${_current_dir}/${_file_type})
@ -78,5 +78,3 @@ lyx_install(${TOP_SRC_DIR}/lib tex * .)
lyx_install(${TOP_SRC_DIR}/lib ui * .) lyx_install(${TOP_SRC_DIR}/lib ui * .)
lyx_install(${TOP_SRC_DIR}/lib . * .) lyx_install(${TOP_SRC_DIR}/lib . * .)
install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)

10
development/cmake/lyx2lyx/CMakeLists.txt
View File

@ -5,7 +5,13 @@
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de> # Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
# #
set(_project "lyx2lyx") configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in
include(../PyCompile) ${CMAKE_CURRENT_BINARY_DIR}/lyx2lyx_version.py)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx2lyx_version.py DESTINATION lyx2lyx)
if (UNIX)
set(_project "lyx2lyx")
include(../PyCompile)
endif()
install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)

7
development/cmake/scripts/CMakeLists.txt
View File

@ -5,5 +5,8 @@
# Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de> # Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
# #
set(_project "scripts") if (UNIX)
include(../PyCompile) set(_project "scripts")
include(../PyCompile)
endif()