[QTerm-cvs] SF.net SVN: qterm:[1296] trunk/qterm-qt4

[<si...@us...>]

Revision: 1296
          http://qterm.svn.sourceforge.net/qterm/?rev=1296&view=rev
Author:   sidos
Date:     2011-10-15 22:27:50 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
files are not installed on MacOSX but included in app bundle

Modified Paths:
--------------
    trunk/qterm-qt4/icons/CMakeLists.txt
    trunk/qterm-qt4/src/CMakeLists.txt
    trunk/qterm-qt4/src/doc/CMakeLists.txt
    trunk/qterm-qt4/src/keyboard_profiles/CMakeLists.txt
    trunk/qterm-qt4/src/po/CMakeLists.txt
    trunk/qterm-qt4/src/scheme/CMakeLists.txt
    trunk/qterm-qt4/src/scripts/CMakeLists.txt

Modified: trunk/qterm-qt4/icons/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/icons/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/icons/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -48,5 +48,6 @@
    endforeach (_current_ICON)
 endmacro(qterm_install_icons)
 
-qterm_install_icons(hicolor)
-
+if (NOT APPLE)
+  qterm_install_icons(hicolor)
+endif ()

Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -273,8 +273,14 @@
    target_link_libraries(${PROGRAME} ${win32Libs})
 endif(WIN32 AND MINGW)
 install(TARGETS ${PROGRAME} DESTINATION bin)
-install(FILES ${qterm_MISC} DESTINATION share/qterm)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qterm.desktop DESTINATION share/applications)
+if (NOT APPLE)
+  install(FILES ${qterm_MISC} DESTINATION share/qterm)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qterm.desktop DESTINATION share/applications)
+endif()
+install(CODE "
+  include(BundleUtilities)
+  fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/MacOS/QTerm\" \"\" \"\")
+  " COMPONENT Runtime)
 add_subdirectory(scheme)
 add_subdirectory(scripts)
 add_subdirectory(po)

Modified: trunk/qterm-qt4/src/doc/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/doc/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/doc/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -24,8 +24,10 @@
 ADD_CUSTOM_TARGET(help_target
   DEPENDS qterm.qhc)
 
-INSTALL(
+if (NOT APPLE)
+  INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/qterm.qhc
     DESTINATION share/qterm/doc
-)
+  )
+endif ()
 

Modified: trunk/qterm-qt4/src/keyboard_profiles/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/keyboard_profiles/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/keyboard_profiles/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -1,3 +1,5 @@
 file(GLOB keyboardFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.keytab")
 file(COPY ${keyboardFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-install(FILES ${keyboardFiles} DESTINATION share/qterm/keyboard_profiles)
+if (NOT APPLE)
+  install(FILES ${keyboardFiles} DESTINATION share/qterm/keyboard_profiles)
+endif ()

Modified: trunk/qterm-qt4/src/po/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/po/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/po/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -1,4 +1,6 @@
 file(GLOB TRANSLATIONS_FILES *.ts)
 qt4_add_translation(QM_FILES ${TRANSLATIONS_FILES})
 add_custom_target(translations_target DEPENDS ${QM_FILES})
-install(FILES ${QM_FILES} DESTINATION share/qterm/po)
+if (NOT APPLE)
+  install(FILES ${QM_FILES} DESTINATION share/qterm/po)
+endif()

Modified: trunk/qterm-qt4/src/scheme/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/scheme/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/scheme/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -1,3 +1,5 @@
 file(GLOB schemeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.scheme")
 file(COPY ${schemeFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-install(FILES ${schemeFiles} DESTINATION share/qterm/scheme)
+if (NOT APPLE)
+  install(FILES ${schemeFiles} DESTINATION share/qterm/scheme)
+endif()

Modified: trunk/qterm-qt4/src/scripts/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/scripts/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
+++ trunk/qterm-qt4/src/scripts/CMakeLists.txt	2011-10-15 22:27:50 UTC (rev 1296)
@@ -1,4 +1,6 @@
 file(GLOB scriptFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.js")
 file(COPY ${scriptFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-install(FILES ${scriptFiles} DESTINATION share/qterm/scripts)
-add_subdirectory(ui)
+if (NOT APPLE)
+  install(FILES ${scriptFiles} DESTINATION share/qterm/scripts)
+  add_subdirectory(ui)
+endif()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.