+ eliminate cmake variable QT_QTCORE_LIBRARY_DEBUG

Frank0587 · Jul 17, 2015 · 74e397c · 74e397c
1 parent bb9f437
commit 74e397c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
@@ -111,12 +111,9 @@ set(QT_LIBRARIES
     debug QtWebKitd4.lib
 )
 
-set(QT_QTCORE_LIBRARY_DEBUG 
-    debug QtCored4.lib
- )
-
 set(QT_QTCORE_LIBRARY 
     optimized QtCore4.lib
+    debug QtCored4.lib
 )
 
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)

diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
@@ -120,12 +120,9 @@ set(QT_LIBRARIES
     debug QtWebKitd4.lib
 )
 
-set(QT_QTCORE_LIBRARY_DEBUG 
-    debug QtCored4.lib
- )
-
 set(QT_QTCORE_LIBRARY 
     optimized QtCore4.lib
+    debug QtCored4.lib
 )
 
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)

diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
@@ -135,20 +135,19 @@ set(QT_LIBRARIES
     debug QtWebKitd4.lib
 )
 
-set(QT_QTCORE_LIBRARY_DEBUG 
-    debug QtCored4.lib
-)
-
 set(QT_QTCORE_LIBRARY 
     optimized QtCore4.lib
+    debug QtCored4.lib
 )
 
-set(QT_QT3SUPPORT_LIBRARY_DEBUG 
-    debug Qt3Supportd4.lib
+set(QT_QTXML_LIBRARY 
+    optimized QtXml4.lib
+    debug QtXmld4.lib
 )
 
 set(QT_QT3SUPPORT_LIBRARY 
     optimized Qt3Support4.lib
+    debug Qt3Supportd4.lib
 )
 
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)