From 74e397c86920fe7d6c696838c366fd754304da81 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 17 Jul 2015 11:33:49 +0200 Subject: [PATCH] + eliminate cmake variable QT_QTCORE_LIBRARY_DEBUG --- cMake/UseLibPack6x.cmake | 5 +---- cMake/UseLibPack7x.cmake | 5 +---- cMake/UseLibPackCustom.cmake | 13 ++++++------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake index b9d804a09..a70f48274 100644 --- 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 index 26165b1b5..4f8c32b39 100644 --- 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 index 679ccf930..ba2bc04dd 100644 --- a/cMake/UseLibPackCustom.cmake +++ b/cMake/UseLibPackCustom.cmake @@ -135,20 +135,19 @@ set(QT_LIBRARIES debug QtWebKitd4.lib ) -set(QT_QTCORE_LIBRARY_DEBUG +set(QT_QTCORE_LIBRARY + optimized QtCore4.lib debug QtCored4.lib ) -set(QT_QTCORE_LIBRARY - optimized QtCore4.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)