0001278: No build possible with current CMake version 2.8.12

2013-10-22 10:33:18 +02:00
parent ae42d66234
commit 201042692d
16 changed files with 16 additions and 84 deletions
--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp
+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp
@@ -50,7 +50,6 @@
 #include "ViewProviderDefects.h"
 #include "ViewProviderPython.h"
 #include "Workbench.h"
-#include "qrc_Mesh.cpp"


 // use a different name to CreateCommand()
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -75,9 +75,9 @@ SET(Inventor_SRCS
 )
 SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})

-fc_add_resources(resource_SRCS Resources/Mesh.qrc)
+qt4_add_resources(resource_SRCS Resources/Mesh.qrc)
 SET(resource_SRCS
-#   ${resource_SRCS}
+    ${resource_SRCS}
    Resources/Mesh.qrc
 )
 SOURCE_GROUP("resource" FILES ${resource_SRCS})