Changeset 571:226a8528be78 in qutecom-2.2 for libs/3rdparty/qt4/CMakeLists.txt

Timestamp:

Mar 10, 2010 10:36:05 AM (3 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

checking if Qt is configured with glib

File:

• libs/3rdparty/qt4/CMakeLists.txt (modified) (4 diffs)

libs/3rdparty/qt4/CMakeLists.txt

@@ -13 +13 @@
 )
 
-#modify webkit/.../RandomNumber.cpp to run on windows2000
-
 # see http://www.cmake.org/pipermail/cmake/2005-August/007149.html
-string(REGEX REPLACE "\\\\" "/" QT_LIBRARY_DIR ${QT_LIBRARY_DIR})
+file(TO_CMAKE_PATH ${QT_LIBRARY_DIR} QT_LIBRARY_DIR)
 
 ow_add_public_library_dirs(
@@ -112 +110 @@
 
 if (MSVC)
-        string(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR})
-        string(REGEX REPLACE "\\\\" "/" QT_PLUGINS_DIR ${QT_PLUGINS_DIR})
-
-file(MAKE_DIRECTORY ${BUILD_DIR}/imageformats/ )
+        file(TO_CMAKE_PATH $ENV{QTDIR} QTDIR)
+        file(TO_CMAKE_PATH ${QT_PLUGINS_DIR} QT_PLUGINS_DIR)
+
+        file(MAKE_DIRECTORY ${BUILD_DIR}/imageformats/ )
         
         if (CMAKE_BUILD_TYPE MATCHES Debug)
@@ -186 +184 @@
 endif (LINUX)
 
+IF(QT_QCONFIG MATCHES "glib")
+        set(QT_WITH_GLIB
+            TRUE
+            CACHE INTERNAL "QT with glib event loop"
+           )
+ENDIF(QT_QCONFIG MATCHES "glib")
 
 # Copy Qt translations
@@ -192 +196 @@
         OUTPUT_VARIABLE QT_INSTALL_TRANSLATIONS)
 
-string(REGEX REPLACE "\\\\" "/" QT_INSTALL_TRANSLATIONS ${QT_INSTALL_TRANSLATIONS})
+file(TO_CMAKE_PATH ${QT_INSTALL_TRANSLATIONS} QT_INSTALL_TRANSLATIONS)
 
 ow_copy_dir(${QT_INSTALL_TRANSLATIONS}/*.qm ${LOCALE_COPY_DIR}/.)