From: Peter Kümmel <syntheticpp@gmx.net>
Date: Sun, 4 Jan 2009 13:00:34 +0000 (+0000)
Subject: cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform
X-Git-Tag: 2.0.0~7511
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=874a696dfa46825e597f828340fe8654f58ca324;p=features.git

cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27982 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 559ecbc459..6e8fcccd8b 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -1,40 +1,66 @@
-# TODO: set correct path
+
+# 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")
 
 # 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 _dir _file_type)
-  foreach(_glob_dir ${ARGN})
-    file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})
-    foreach(_current_dir ${_dir_list})
-      file(GLOB files_list ${_current_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")
-      GET_FILENAME_COMPONENT(_base_dir ${_current_dir} NAME)
-      install(FILES ${files_list} DESTINATION ${_dir}/${_base_dir})
-      #message(STATUS "install ${_dir}/${_base_dir}: ${files_list} ")
-      #message(STATUS "install at ${CMAKE_INSTALL_PREFIX}/${_dir}/${_base_dir}")
-    endforeach(_current_dir)
-  endforeach(_glob_dir)
+macro(lyx_install _parent_src_dir _gl_dir _file_type)
+  file(GLOB _dirs RELATIVE "${_parent_src_dir}" ${_parent_src_dir}/${_gl_dir})
+  if(NOT _dirs)
+    set(_dirs .)
+  endif() 
+  foreach(_dir ${_dirs})
+    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() 
+      #message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ")
+      foreach(_current_dir ${_dir_list})
+        file(GLOB _item_list ${_current_dir}/${_file_type})
+        set(files_list ${_item_list})
+        foreach(_current_item ${_item_list})
+          if(IS_DIRECTORY ${_current_item})
+            #message(STATUS "removing ${_current_item}")
+            if(files_list)
+              list(REMOVE_ITEM files_list "${_current_item}")
+            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}/Makefile.am")
+          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})
+        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   . [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
-#lyx_install(${TOP_SRC_DIR}/lib doc          *.lyx    . [a-z][a-z])
-#lyx_install(${TOP_SRC_DIR}/lib doc          *.txt    . [a-z][a-z])
+#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)
-lyx_install(${TOP_SRC_DIR}/lib doc/de       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib doc/es       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib doc/fr       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib doc/it       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib doc/ja       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib doc/uk       *      clipart)
-lyx_install(${TOP_SRC_DIR}/lib examples     *      . [a-z][a-z])
+
+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 kbd          *      .)
@@ -47,3 +73,4 @@ lyx_install(${TOP_SRC_DIR}/lib ui           *      .)
 lyx_install(${TOP_SRC_DIR}/lib .            *      .)
 
 install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)
+