X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FInstall.cmake;h=02645af2f424c539e04aba57d201bf27bbb8d343;hb=0ba6efb073233867373d2fb338eaac0a8f895be8;hp=a4fa7f81e4320970b3082b0d5233aa389fbe4136;hpb=b89a2ff5100e5ea9ce4d05b604a1f01475c7a3b2;p=lyx.git

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index a4fa7f81e4..02645af2f4 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,13 +2,15 @@
 # TODO: set correct path in call to cmake
 # e.g. cmake /usr/src/lyx/lyx-devel/development/cmake -DCMAKE_INSTALL_PREFIX=/usr/local/share/lyx2.0 -Dnls=1
 
-message(STATUS "installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
+message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
 
 # the macro scans the directories "_parent_src_dir/_dir/_current_dir" for *._file_type files
 # and installs the files in CMAKE_INSTALL_PREFIX/_current_dir
 # dir_item is on item of the remaining arguments
 macro(lyx_install _parent_src_dir _gl_dir _file_type)
+  #message("checking parents ${_parent_src_dir}")
   file(GLOB _dirs RELATIVE "${_parent_src_dir}" ${_parent_src_dir}/${_gl_dir})
+  #cmake bug on Windows: if _gl_dir==. _dirs is empty but on linux _dirs==.
   if(NOT _dirs)
     set(_dirs .)
   endif() 
@@ -16,11 +18,14 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
     foreach(_glob_dir ${ARGN})
       file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})
       if(NOT _dir_list)
-        set(_dir_list ${_parent_src_dir}/${_dir})
-      endif() 
+        if(_glob_dir STREQUAL ".")
+          set(_dir_list ${_parent_src_dir}/${_dir}/.)
+        endif()
+      endif()
       #message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ")
       foreach(_current_dir ${_dir_list})
         file(GLOB _item_list ${_current_dir}/${_file_type})
+        #cmake bug: globbing with * also returns directories on Windows
         set(files_list ${_item_list})
         foreach(_current_item ${_item_list})
           if(IS_DIRECTORY ${_current_item})
@@ -34,26 +39,28 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
           list(REMOVE_ITEM files_list "${_current_dir}/.svn")
           list(REMOVE_ITEM files_list "${_current_dir}/Makefile.in")
           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)
           if(_glob_dir STREQUAL ".")
             set(_base_dir .)
           endif()
-          #message(STATUS "install ${_dir}/${_base_dir}: ${files_list} ")
-          #message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${_dir}/${_base_dir}")
-          install(FILES ${files_list} DESTINATION ${_dir}/${_base_dir})
+          #message(STATUS "install ${LYX_DATA_SUBDIR}${_dir}/${_base_dir}: ${files_list} ")
+          #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()
       endforeach(_current_dir)
     endforeach(_glob_dir)
   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)
@@ -62,15 +69,15 @@ lyx_install(${TOP_SRC_DIR}/lib doc/${_all_languages} *    clipart)
 
 lyx_install(${TOP_SRC_DIR}/lib examples     *      . ${_all_languages})
 lyx_install(${TOP_SRC_DIR}/lib fonts        *      .)
-lyx_install(${TOP_SRC_DIR}/lib images       *      . math commands attic)
+lyx_install(${TOP_SRC_DIR}/lib images       *      . math commands attic classic oxygen)
 lyx_install(${TOP_SRC_DIR}/lib kbd          *      .)
 lyx_install(${TOP_SRC_DIR}/lib layouts      *      .)
-lyx_install(${TOP_SRC_DIR}/lib lyx2lyx      *      .)
-lyx_install(${TOP_SRC_DIR}/lib scripts      *      .)
+lyx_install(${TOP_SRC_DIR}/lib lyx2lyx      *.py   .)
+lyx_install(${TOP_SRC_DIR}/lib scripts      *.py   .)
+lyx_install(${TOP_SRC_DIR}/lib scripts      *.R    .)
 lyx_install(${TOP_SRC_DIR}/lib templates    *      .)
 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/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)
-
+lyx_install(${TOP_SRC_DIR}/lib templates/thesis    *      .)