Build is now working with CMake and QMake

ramsampath · Apr 1, 2014 · bd1ad0e · bd1ad0e
1 parent 5467b50
commit bd1ad0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/QGVCore/GraphViz.pri b/QGVCore/GraphViz.pri
@@ -1,7 +1,7 @@
 #GraphViz librairie
 DEFINES += WITH_CGRAPH
 INCLUDEPATH += private
-QMAKE_CXXFLAGS += -DQGVCORE_LIB -DQMAKE_MOC
+QMAKE_CXXFLAGS += -DQGVCORE_LIB
 
 unix {
  CONFIG += link_pkgconfig

diff --git a/QGVCore/QGVScene.cpp b/QGVCore/QGVScene.cpp
@@ -17,9 +17,7 @@ License along with this library.
 ***************************************************************/
 #include "QGVScene.h"
 // The following include allows the automoc to detect, that it must moc this class
-#ifndef QMAKE_MOC
-	#include "moc_QGVScene.cpp"
-#endif
+#include "moc_QGVScene.cpp"
 #include <QDebug>
 
 #include <QGVNode.h>