Changeset 117:f3ffc9444e74 in qutecom coip

Timestamp:

08/22/08 17:45:28 (3 months ago)

Author:

laurent@…

Message:

-add qt4 in \libs\3rdparty\CMakeLists.txt
-add qtwebkit sub projet

Location:

libs/3rdparty

Files:

• CMakeLists.txt (modified) (2 diffs)
• qt4/CMakeLists.txt (modified) (2 diffs)
• qtgui/CMakeLists.txt (modified) (1 diff)
• qtwebkit/CMakeLists.txt (added)

libs/3rdparty/CMakeLists.txt

@@ -41 +41 @@
 #       boost-python
 
-        #qt4
+        qt4
 
         qtcore
@@ -55 +55 @@
 #       qttest
         qtxml
-
+        qtwebkit
         openssl
         libxml

libs/3rdparty/qt4/CMakeLists.txt

@@ -24 +24 @@
                 ${QT_QTXML_LIBRARY_DEBUG}
                 ${QT_QTSVG_LIBRARY_DEBUG}
+                ${QT_QTWEBKIT_LIBRARY_DEBUG}
         )
         if (UNIX)
@@ -68 +69 @@
                 ${QT_QTXML_LIBRARY_RELEASE}
                 ${QT_QTSVG_LIBRARY_RELEASE}
+                ${QT_QTWEBKIT_LIBRARY_RELEASE}
                 ${QT_QTMAIN_LIBRARY_RELEASE} # For WinMain under Windows
                 QtUiTools

libs/3rdparty/qtgui/CMakeLists.txt

@@ -25 +25 @@
         )
 endif (CMAKE_BUILD_TYPE MATCHES Debug)
-
-if (MSVC)
-        string(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR})
-        string(REGEX REPLACE "\\\\" "/" QT_PLUGINS_DIR ${QT_PLUGINS_DIR})
-
-        if (CMAKE_BUILD_TYPE MATCHES Debug)
-                ow_copy_file(${QTDIR}/bin/QtGuid4.dll ${BUILD_DIR})
-                #${BUILD_DIR}/imageformats/qmngd1.dll first then it creates imageformats directory
-                ow_copy_file(${QT_PLUGINS_DIR}/imageformats/qmngd1.dll ${BUILD_DIR}/imageformats/qmngd1.dll)
-                ow_copy_file(${QT_PLUGINS_DIR}/imageformats/qjpegd1.dll ${BUILD_DIR}/imageformats)
-                ow_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/binary-lib/msvc/imageformats/qgifd1.dll ${BUILD_DIR}/imageformats)
-        else (CMAKE_BUILD_TYPE MATCHES Debug)
-                ow_copy_file(${QTDIR}/bin/QtGui4.dll ${BUILD_DIR})
-                #${BUILD_DIR}/imageformats/qmng1.dll first then it creates imageformats directory
-                ow_copy_file(${QT_PLUGINS_DIR}/imageformats/qmng1.dll ${BUILD_DIR}/imageformats/qmng1.dll)
-                ow_copy_file(${QT_PLUGINS_DIR}/imageformats/qjpeg1.dll ${BUILD_DIR}/imageformats)
-                ow_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/binary-lib/msvc/imageformats/qgif1.dll ${BUILD_DIR}/imageformats)
-        endif (CMAKE_BUILD_TYPE MATCHES Debug)
-endif (MSVC)
-
-if (LINUX)
-        if (CMAKE_BUILD_TYPE MATCHES Debug)
-                set(suffix "_debug")
-        else (CMAKE_BUILD_TYPE MATCHES Debug)
-                set(suffix "")
-        endif (CMAKE_BUILD_TYPE MATCHES Debug)
-
-        file(GLOB pluginList "${QT_PLUGINS_DIR}/imageformats/*${suffix}.so")
-        foreach(pluginPath ${pluginList})
-                get_filename_component(pluginName "${pluginPath}" NAME)
-                ow_copy_file(${pluginPath} ${BUILD_DIR}/imageformats/${pluginName})
-        endforeach(pluginPath)
-endif (LINUX)
-
-# Copy Qt translations
-exec_program(${QT_QMAKE_EXECUTABLE}
-        ARGS "-query QT_INSTALL_TRANSLATIONS"
-        OUTPUT_VARIABLE QT_INSTALL_TRANSLATIONS)
-
-string(REGEX REPLACE "\\\\" "/" QT_INSTALL_TRANSLATIONS ${QT_INSTALL_TRANSLATIONS})
-
-ow_copy_dir(${QT_INSTALL_TRANSLATIONS}/*.qm ${LOCALE_COPY_DIR}/.)