cmake: add option to rebuild merged files

[lyx.git] / development / cmake / Install.cmake

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 4d3ea60b21eb28c638f7afd79464884a1ec08c36..fd8f1a55cc44f2c55023f6c19eb20a040b09992e 100755 (executable)
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,7 +2,7 @@
 # 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
@@ -18,12 +18,9 @@ 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)
-       if(_glob_dir STREQUAL ".")
+        if(_glob_dir STREQUAL ".")
           set(_dir_list ${_parent_src_dir}/${_dir}/.)
-       endif()
-      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})
@@ -46,9 +43,9 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
           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)
@@ -81,5 +78,3 @@ 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)
-