cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34283 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index 75d93cd8ea019f749b99d681f5039d4cdd7bfc2c..d2f70297ee18a2cc333ec83e6bd865a5c4862732 100644 (file)
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -21,12 +21,12 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#ifdef LYX_MERGED_BUILD
+#if defined(LYX_MERGED_BUILD) && !defined(Q_CC_MSVC)
 // GCC couldn't find operator==
 namespace lyx {
-       bool operator==(lyx::docstring & d, char const * c);
+       bool operator==(lyx::docstring const & d, char const * c);
        namespace frontend {
-               bool operator==(lyx::docstring & d, char const * c) 
+               bool operator==(lyx::docstring const & d, char const * c) 
                  { return lyx::operator ==(d, c); }
        }
 }