X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FInstall.cmake;h=6d23e522f1d4e5df4f0fba2afd612c5bd0a7387f;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=5402d5bc42669f4afa65c1e6968fe04a89f5f2c4;hpb=28b401b40ee8a18d604f73f7948142644b5fbadf;p=lyx.git

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 5402d5bc42..6d23e522f1 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,7 +2,21 @@
 # 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")
+if(NOT(LYX_BUNDLE) AND APPLE)
+        message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
+endif()
+set(OSX_BUNDLE_FILES "")
+
+# Install files into OS X bundle
+macro(lyx_install_osx basedir files)
+  if(LYX_BUNDLE_PROPERTY_MODE STREQUAL "ON")
+    foreach(file ${files})
+      set_source_files_properties("${file}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${basedir}")
+    endforeach()
+  else()
+    list(APPEND OSX_BUNDLE_FILES "${files}")
+  endif()
+endmacro(lyx_install_osx)
 
 # 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
@@ -27,6 +41,7 @@ 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(files_list)
 	    if(IS_DIRECTORY ${_current_item})
@@ -41,6 +56,10 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
 		#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)
@@ -54,8 +73,22 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
           endif()
           #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})
+	  if(APPLE)
+	    lyx_install_osx("${_dir}/${_based_dir}" "${files_list}")
+	  else()
+	    install(FILES ${files_list} DESTINATION ${LYX_DATA_SUBDIR}${_dir}/${_base_dir})
+	  endif(APPLE)
         endif()
+	if(program_list)
+	  if(_glob_dir STREQUAL ".")
+	    set(_base_dir .)
+	  endif()
+	  if(APPLE)
+	    lyx_install_osx("${_dir}/${_based_dir}" "${program_list}")
+	  else()
+	    install(PROGRAMS ${program_list} DESTINATION ${LYX_DATA_SUBDIR}${_dir}/${_base_dir})
+	  endif(APPLE)
+	endif()
       endforeach(_current_dir)
     endforeach(_glob_dir)
   endforeach(_dir)
@@ -75,19 +108,28 @@ lyx_install(${TOP_SRC_DIR}/lib doc          *      biblio clipart)
 
 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 examples     *      . ${_all_languages} springer thesis)
 lyx_install(${TOP_SRC_DIR}/lib fonts        *      .)
-lyx_install(${TOP_SRC_DIR}/lib images       *      . math commands attic classic oxygen)
+lyx_install(${TOP_SRC_DIR}/lib images       *      . math ipa 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      *.py   .)
 lyx_install(${TOP_SRC_DIR}/lib scripts      *.py   .)
 lyx_install(${TOP_SRC_DIR}/lib scripts      *.R    .)
-lyx_install(${TOP_SRC_DIR}/lib templates    *      . attic springer thesis)
+lyx_install(${TOP_SRC_DIR}/lib templates    *      . attic)
 lyx_install(${TOP_SRC_DIR}/lib tex          *      .)
 lyx_install(${TOP_SRC_DIR}/lib ui           *      .)
 lyx_install(${TOP_SRC_DIR}/lib .            *      .)
 
+# Install
+if(APPLE)
+    lyx_install(${TOP_SRC_DIR}/development/MacOSX . *.sdef   .)
+    lyx_install(${TOP_SRC_DIR}/development/MacOSX . *.icns   .)
+    lyx_install(${TOP_SRC_DIR}/development/MacOSX . qt.conf   .)
+endif()
+
+install(PROGRAMS ${TOP_SRC_DIR}/lib/scripts/listerrors DESTINATION scripts)
+
 if(UNIX)
   set(program_suffix ${PROGRAM_SUFFIX})
   configure_file(${TOP_SRC_DIR}/lib/lyx.desktop.in lyx${PROGRAM_SUFFIX}.desktop)