From 62c6a61b8b3f5a6589d9e6780e85062e3150d1a8 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 15 Jul 2015 13:33:31 +0200 Subject: [PATCH] + fix cmake variables related to debug/release libraries of Qt --- cMake/UseLibPack10x.cmake | 6 +----- cMake/UseLibPack9x.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake index 36a436aa1..3a009f174 100644 --- a/cMake/UseLibPack10x.cmake +++ b/cMake/UseLibPack10x.cmake @@ -135,12 +135,8 @@ set(QT_QTCORE_LIBRARY optimized QtCore4.lib debug QtCored4.lib ) -set(QT_QT3SUPPORT_LIBRARY_DEBUG - debug Qt3Supportd4.lib -) - set(QT_QT3SUPPORT_LIBRARY - optimized Qt3Support4.lib + optimized Qt3Support4.lib debug Qt3Supportd4.lib ) set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe) diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake index e2f46f8b1..a732fb716 100644 --- a/cMake/UseLibPack9x.cmake +++ b/cMake/UseLibPack9x.cmake @@ -110,6 +110,10 @@ set(QT_QTCORE_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtCore ) +set(QT_QTXML_INCLUDE_DIR + ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtXml +) + set(QT_QT3SUPPORT_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/Qt3Support ) @@ -144,12 +148,14 @@ set(QT_QTCORE_LIBRARY 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)