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

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

Revision: 1295
          http://qterm.svn.sourceforge.net/qterm/?rev=1295&view=rev
Author:   sidos
Date:     2011-10-15 21:11:02 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
build app bundle on mac os x

Modified Paths:
--------------
    trunk/qterm-qt4/CMakeLists.txt
    trunk/qterm-qt4/src/CMakeLists.txt
    trunk/qterm-qt4/src/qterm.cfg

Modified: trunk/qterm-qt4/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/CMakeLists.txt	2011-10-15 21:08:45 UTC (rev 1294)
+++ trunk/qterm-qt4/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
@@ -14,6 +14,14 @@
     ADD_DEFINITIONS (/D _CRT_SECURE_NO_WARNINGS)
 ENDIF(WIN32 AND MSVC)
 
+IF(APPLE)
+   SET (PROGRAME QTerm)
+   SET (MACOSX_BUNDLE_VERSION $QTERM_VERSION)
+   SET (MACOSX_BUNDLE_ICON_FILE QTerm.icns)
+ELSE(APPLE)
+   SET (PROGRAME qterm)
+ENDIF(APPLE)
+
 add_subdirectory(src)
 add_subdirectory(icons)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt	2011-10-15 21:08:45 UTC (rev 1294)
+++ trunk/qterm-qt4/src/CMakeLists.txt	2011-10-15 21:11:02 UTC (rev 1295)
@@ -197,6 +197,15 @@
 
 file(COPY ${qterm_MISC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
+find_program(XDGOPEN NAME xdg-open DOC "Looking for xdg-open")
+if (XDGOPEN_FOUND)
+  set (HTTP xdg-open)
+else (XDGOPEN_FOUND)
+  set (HTTP)
+endif (XDGOPEN_FOUND)
+
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/qterm.cfg ${CMAKE_CURRENT_BINARY_DIR}/qterm.cfg)
+
 if(WIN32)
   if(MINGW)
     # resource compilation for mingw
@@ -233,11 +242,27 @@
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR})
 if(WIN32)
-   add_executable(qterm WIN32 ${qterm_SRCS} ${qterm_RCCS_SRCS})
-else(WIN32)
-   add_executable(qterm ${qterm_SRCS} ${qterm_RCCS_SRCS})
-endif(WIN32)
-target_link_libraries(qterm
+   add_executable(${PROGRAME} WIN32 ${qterm_SRCS} ${qterm_RCCS_SRCS})
+elseif(APPLE)
+   set(qterm_MISC  ${qterm_MISC} ${CMAKE_CURRENT_SOURCE_DIR}/../icons/QTerm.icns)
+   set_source_files_properties(${qterm_MISC} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+   add_executable(${PROGRAME} MACOSX_BUNDLE ${qterm_SRCS} ${qterm_RCCS_SRCS} ${qterm_MISC} ) 
+   add_custom_command( TARGET ${PROGRAME} PRE_BUILD
+     COMMAND mkdir ARGS -p ${PROGRAME}.app/Contents/MacOS
+     COMMAND mkdir ARGS -p ${PROGRAME}.app/Contents/Resources
+     COMMAND mkdir ARGS -p ${PROGRAME}.app/Contents/Resources/po
+     COMMAND mkdir ARGS -p ${PROGRAME}.app/Contents/Resources/doc
+     COMMAND mkdir ARGS -p ${PROGRAME}.app/Contents/Resources/keyboard_profiles
+   )
+   add_custom_command( TARGET ${PROGRAME} POST_BUILD
+     COMMAND cp ARGS ${CMAKE_CURRENT_BINARY_DIR}/po/*.qm ${PROGRAME}.app/Contents/Resources/po
+     COMMAND cp ARGS ${CMAKE_CURRENT_BINARY_DIR}/doc/*.{qhc,qch} ${PROGRAME}.app/Contents/Resources/doc
+     COMMAND cp ARGS ${CMAKE_CURRENT_BINARY_DIR}/keyboard_profiles/*.keytab ${PROGRAME}.app/Contents/Resources/keyboard_profiles
+   )
+else()
+   add_executable(${PROGRAME} ${qterm_SRCS} ${qterm_RCCS_SRCS})
+endif()
+target_link_libraries(${PROGRAME}
    ${QT_LIBRARIES}
    ${QT_QTCORE_LIBRARY}
    ${QT_QTGUI_LIBRARY}
@@ -245,9 +270,9 @@
    ${QT_QTXML_LIBRARY}
    ${optionalLibs})
 if(WIN32 AND MINGW)
-   target_link_libraries(qterm ${win32Libs})
+   target_link_libraries(${PROGRAME} ${win32Libs})
 endif(WIN32 AND MINGW)
-install(TARGETS qterm DESTINATION bin)
+install(TARGETS ${PROGRAME} DESTINATION bin)
 install(FILES ${qterm_MISC} DESTINATION share/qterm)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qterm.desktop DESTINATION share/applications)
 add_subdirectory(scheme)
@@ -255,7 +280,7 @@
 add_subdirectory(po)
 add_subdirectory(keyboard_profiles)
 add_subdirectory(doc)
-add_dependencies(qterm translations_target help_target)
+add_dependencies(${PROGRAME} translations_target help_target)
 if(QTERM_ENABLE_TEST)
    add_subdirectory(test)
 endif(QTERM_ENABLE_TEST)

Modified: trunk/qterm-qt4/src/qterm.cfg
===================================================================
--- trunk/qterm-qt4/src/qterm.cfg	2011-10-15 21:08:45 UTC (rev 1294)
+++ trunk/qterm-qt4/src/qterm.cfg	2011-10-15 21:11:02 UTC (rev 1295)
@@ -34,7 +34,7 @@
 blinktab=1
 warn=1
 beep=1
-http=xdg-open
+http=${HTTP}
 antialias=1
 tray=0
 

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