[Tora-cvs] SF.net SVN: tora:[3954] trunk/tora

[<su...@us...>]

Revision: 3954
          http://tora.svn.sourceforge.net/tora/?rev=3954&view=rev
Author:   subik
Date:     2011-05-02 09:01:40 +0000 (Mon, 02 May 2011)

Log Message:
-----------
long time forgotten to commit files for mac... sorry.

Modified Paths:
--------------
    trunk/tora/CMakeLists.txt
    trunk/tora/src/CMakeLists.txt

Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt	2011-05-02 08:53:52 UTC (rev 3953)
+++ trunk/tora/CMakeLists.txt	2011-05-02 09:01:40 UTC (rev 3954)
@@ -11,6 +11,7 @@
 OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON)
 OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF)
 OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON)
+OPTION(WANT_UNIVERSAL "Build mac binary for 32 and 64 bit together" ON)
 OPTION(USE_TROTL "Use trotl OCI wrapper library" OFF)
 OPTION(USE_PCH "Use percompiled headers" ON)
 
@@ -134,6 +135,14 @@
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
 
+IF (WANT_UNIVERSAL)
+    #SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -arch i386 -arch x86_64")
+    #SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -arch i386 -arch x86_64")
+    #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -arch i386 -arch x86_64")
+    #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -arch i386 -arch x86_64")
+    SET (CMAKE_OSX_ARCHITECTURES "i386;x86_64;")
+ENDIF (WANT_UNIVERSAL)
+
 ENDIF (CMAKE_COMPILER_IS_GNUCC)
 
 #Convert our simpler command line option to the CMake style

Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt	2011-05-02 08:53:52 UTC (rev 3953)
+++ trunk/tora/src/CMakeLists.txt	2011-05-02 09:01:40 UTC (rev 3954)
@@ -9,6 +9,8 @@
 ENDIF (WIN32)
 
 IF (USE_TROTL)
+  find_package(Boost REQUIRED)
+  include_directories(${Boost_INCLUDE_DIRS})
   ADD_SUBDIRECTORY(trotl)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/trotl/src)
   LINK_DIRECTORIES(./trotl)
@@ -23,8 +25,12 @@
 
 # only toad bindings are here. All others qm files will blow the binary too much
 SET (TORA_I18N_TS
-    i18n/tora_toad.ts
+    #i18n/tora_fr.ts
+    #i18n/tora_it.ts
+    #i18n/tora_se.ts
+    #i18n/tora_es.ts
 )
+SET (TORA_I18N_TS_TOAD i18n/tora_toad.ts)
 
 SET(TORA_RCC_FILES tora.qrc)
 
@@ -463,7 +469,7 @@
 
 
 
-QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS})
+QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS} ${TORA_I18N_TS_TOAD})
 QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} )
 QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES})
 QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
@@ -606,102 +612,42 @@
 ENDIF (WIN32)
 
 IF (WIN32)
+    # Windows install
     INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .)
+    INSTALL(FILES ${TORA_I18N_QM} DESTINATION ./i18n )
 ELSE (WIN32)
     IF (NOT WANT_BUNDLE)
+        # Unix install
         INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
+        INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n)
     ELSE (NOT WANT_BUNDLE)
 
-      SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx_tools/Info.plist.in")
-      SET(MACOSX_BUNDLE_ICON_FILE tora.icns)
-      SET(MACOSX_BUNDLE_INFO_STRING "${EXE_NAME} ${VERSION}")
-      SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.torasql")
-      SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
-      SET(MACOSX_BUNDLE_BUNDLE_NAME "${EXE_NAME}")
-      SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
-      SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
-      SET(MACOSX_BUNDLE_COPYRIGHT "(c) TOra developers")
-      SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        # mac's bundle install
+        SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx_tools/Info.plist.in")
+        SET(MACOSX_BUNDLE_ICON_FILE tora.icns)
+        SET(MACOSX_BUNDLE_INFO_STRING "${EXE_NAME} ${VERSION}")
+        SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.torasql")
+        SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
+        SET(MACOSX_BUNDLE_BUNDLE_NAME "${EXE_NAME}")
+        SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
+        SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
+        SET(MACOSX_BUNDLE_COPYRIGHT "(c) TOra developers")
+        SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
-        # Warning: This is dangerous to touch. Except you know what are you doing.
-        #          I ususaly don't know anything about it. But it's working ;)
- 
         INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-      IF (WANT_BUNDLE_STANDALONE)
-        # --- If we are on OS X copy all the embedded libraries to the app bundle
-        # -------- Function to build OS X Stand Alone Bundles -----------------
-        function(MakeOSXBundleApp target binary_dir)
-            #-- Set some useful variables
-            SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake")
-            SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh")
-            #-- Configure the cmake file and the shell script
-            CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in"
-                           "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE)
-            CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in"
-                           "${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE)
-            #-- Create the installation code
-            install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}")
-        endfunction(MakeOSXBundleApp)
+        # handle all dependencies in the mac bundle - path fixes etc
+        IF (WANT_BUNDLE_STANDALONE)
+            configure_file(${CMAKE_SOURCE_DIR}/osx_tools/bundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/bundle.cmake @ONLY)
+            INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/bundle.cmake)
+        ENDIF (WANT_BUNDLE_STANDALONE)
+        
+        INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/i18n)
 
-
-        install(DIRECTORY ${QT_PLUGINS_DIR}/
-                DESTINATION ${PROJECT_BINARY_DIR}/Contents/Plugins/
-                REGEX "(designer|script|phonon_backend|debug|sqlite|ico)" EXCLUDE)
-
-        install(CODE "
-            # glob for previously installed qt plugins to include in fixup_bundle
-            file(GLOB_RECURSE PluginList
-                 ${PROJECT_BINARY_DIR}/Contents/Plugins/*.bundle)
-        ")
-
-        MakeOSXBundleApp(${EXE_NAME} ${PROJECT_BINARY_DIR})
-
-        # TODO/FIXME: this is evil! And it should be done automagically...
-        set(hack_bundle_pth "${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/MacOS")
-        INSTALL(CODE "file(MAKE_DIRECTORY ${hack_bundle_pth}/sqldrivers)")
-        INSTALL(CODE "file(MAKE_DIRECTORY ${hack_bundle_pth}/codecs)")
-        INSTALL(CODE "file(MAKE_DIRECTORY ${hack_bundle_pth}/accessible)")
-        INSTALL(CODE "file(MAKE_DIRECTORY ${hack_bundle_pth}/imageformats)")
-        INSTALL(CODE "file(MAKE_DIRECTORY ${hack_bundle_pth}/graphicssystems)")
-        function(hack_move_plugins filename targetdir)
-            install(CODE "
-                message(STATUS \"file:: ${filename} -> targetdir: ${targetdir} ${hack_bundle_pth}\")
-            ")
-            install(FILES ${hack_bundle_pth}/${filename} DESTINATION ${hack_bundle_pth}/${targetdir})
-            install(CODE "file(REMOVE ${hack_bundle_pth}/${filename})")
-        endfunction(hack_move_plugins)
-        hack_move_plugins("libqcncodecs.bundle" "codecs")
-        hack_move_plugins("libqjpcodecs.bundle" "codecs")
-        hack_move_plugins("libqtwcodecs.bundle" "codecs")
-        hack_move_plugins("libqkrcodecs.bundle" "codecs")
-        hack_move_plugins("libqsqlmysql.bundle" "sqldrivers")
-        hack_move_plugins("libqsqlodbc.bundle" "sqldrivers")
-        hack_move_plugins("libqsqlpsql.bundle" "sqldrivers")
-        hack_move_plugins("libqgif.bundle" "imageformats")
-        hack_move_plugins("libqjpeg.bundle" "imageformats")
-        hack_move_plugins("libqmng.bundle" "imageformats")
-        hack_move_plugins("libqsvg.bundle" "imageformats")
-        hack_move_plugins("libqtiff.bundle" "imageformats")
-        hack_move_plugins("libqtaccessiblewidgets.bundle" "accessible")
-        hack_move_plugins("libqtaccessiblecompatwidgets.bundle" "accessible")
-        hack_move_plugins("libqglgraphicssystem.bundle" "graphicssystems")
-        # end of hack
-
-        #-- Put an empty qt.conf file in the bundle so as to NOT load plugins from the installed Qt.
-        INSTALL(CODE "message(STATUS \"${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/qt.conf\")")
-        INSTALL(FILES "${CMAKE_SOURCE_DIR}/osx_tools/qt.conf.in"
-                DESTINATION "${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/"
-                RENAME "qt.conf")
-
-        if ("${QT_MAC_USE_COCOA}" STREQUAL "1")
-            INSTALL(CODE "message(STATUS \"Copying qt_menu.nib into ${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources\")")
-            INSTALL(CODE "file(MAKE_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/qt_menu.nib\")")
-            INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
-                             \"${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib\"
-                             \"${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/qt_menu.nib\")")
-        endif()
-      ENDIF (WANT_BUNDLE_STANDALONE)
-
     ENDIF (NOT WANT_BUNDLE)
 ENDIF (WIN32)
+
+
+#set (FILES_TO_TRANSLATE ${TORA_UI_SRC} ${TORA_SOURCES} ${TORA_MOC_CLASSES})
+#qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TORA_I18N_TS})
+#add_custom_command (lupdate DEPENDS ${QM_FILES} )


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