anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not py-compile also on cmake build, backport r40648

Browse Source
This commit is contained in:
Kornel Benko 2012-03-15 17:24:07 +01:00
parent 7d200f302d
commit 729fa7c253
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
development/cmake/Install.cmake
View File

@ -27,17 +27,30 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
file(GLOB _item_list ${_current_dir}/${_file_type})
#cmake bug: globbing with * also returns directories on Windows
set(files_list ${_item_list})
set(program_list)
foreach(_current_item ${_item_list})
if(IS_DIRECTORY ${_current_item})
#message(STATUS "removing ${_current_item}")
if(files_list)
if(files_list)
if(IS_DIRECTORY ${_current_item})
#message(STATUS "removing dir ${_current_item}")
list(REMOVE_ITEM files_list "${_current_item}")
endif()
else()
if(_current_item MATCHES "/\\.[^/]+$")
#message(STATUS "removing hidden ${_current_item}")
list(REMOVE_ITEM files_list "${_current_item}")
endif()
if(_current_item MATCHES "\\.in$")
#message(STATUS "removing .in file ${_current_item}")
list(REMOVE_ITEM files_list "${_current_item}")
endif()
if(_current_item MATCHES "\\.py$")
list(REMOVE_ITEM files_list "${_current_item}")
list(APPEND program_list "${_current_item}")
endif()
endif()
endif()
endforeach(_current_item)
if(files_list)
list(REMOVE_ITEM files_list "${_current_dir}/.svn")
list(REMOVE_ITEM files_list "${_current_dir}/Makefile.in")
list(REMOVE_ITEM files_list "${_current_dir}/lyx.svg")
list(REMOVE_ITEM files_list "${_current_dir}/Makefile.am")
list(REMOVE_ITEM files_list "${_current_dir}/layouttranslations")
GET_FILENAME_COMPONENT(_base_dir ${_current_dir} NAME)
@ -48,6 +61,12 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
#message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}${_dir}/${_base_dir}")
install(FILES ${files_list} DESTINATION ${LYX_DATA_SUBDIR}${_dir}/${_base_dir})
endif()
if(program_list)
if(_glob_dir STREQUAL ".")
set(_base_dir .)
endif()
install(PROGRAMS ${program_list} DESTINATION ${LYX_DATA_SUBDIR}${_dir}/${_base_dir})
endif()
endforeach(_current_dir)
endforeach(_glob_dir)
endforeach(_dir)
@ -80,3 +99,5 @@ lyx_install(${TOP_SRC_DIR}/lib tex * .)
lyx_install(${TOP_SRC_DIR}/lib ui * .)
lyx_install(${TOP_SRC_DIR}/lib . * .)
install(PROGRAMS ${TOP_SRC_DIR}/lib/scripts/listerrors DESTINATION scripts)

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

@ -11,7 +11,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx2lyx_version.py DESTINATION ${LYX_D
if (UNIX)
set(_project "lyx2lyx")
include(../PyCompile)
# include(../PyCompile)
endif()
install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION ${LYX_DATA_SUBDIR}lyx2lyx)

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

@ -7,6 +7,6 @@
if (UNIX)
set(_project "scripts")
include(../PyCompile)
# include(../PyCompile)
endif()