0001278: No build possible with current CMake version 2.8.12

This commit is contained in:
wmayer
2013-10-22 10:33:18 +02:00
parent ae42d66234
commit 201042692d
16 changed files with 16 additions and 84 deletions

View File

@@ -20,7 +20,6 @@
#include <Gui/Language/Translator.h>
#include "Workbench.h"
#include "ViewProviderImagePlane.h"
#include "qrc_Image.cpp"
// use a different name to CreateCommand()
void CreateImageCommands(void);

View File

@@ -30,8 +30,7 @@ SET(ImageGui_RES_SRCS
Resources/Image.qrc
)
fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
set(ImageGui_UIC_SRCS
ImageOrientationDialog.ui
@@ -40,7 +39,7 @@ qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS})
SET(ImageGui_SRCS
# ${ImageGui_MOC_SRCS}
# ${ImageGui_QRC_SRCS}
${ImageGui_QRC_SRCS}
${ImageGui_UIC_HDRS}
AppImageGui.cpp
AppImageGuiPy.cpp

View File

@@ -50,7 +50,6 @@
#include "ViewProviderDefects.h"
#include "ViewProviderPython.h"
#include "Workbench.h"
#include "qrc_Mesh.cpp"
// use a different name to CreateCommand()

View File

@@ -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})

View File

@@ -57,7 +57,6 @@
#include "Workbench.h"
#include <Gui/Language/Translator.h>
#include "qrc_Part.cpp"
#include "Resources/icons/PartFeature.xpm"
#include "Resources/icons/PartFeatureImport.xpm"

View File

@@ -50,7 +50,7 @@ set(PartGui_MOC_HDRS
fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})
SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})
fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
set(PartGui_UIC_SRCS
CrossSections.ui
@@ -77,7 +77,7 @@ set(PartGui_UIC_SRCS
qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
SET(PartGui_SRCS
# ${PartGui_QRC_SRCS}
${PartGui_QRC_SRCS}
${PartGui_UIC_HDRS}
AppPartGui.cpp
Command.cpp

View File

@@ -33,7 +33,6 @@
#include "ViewProvider.h"
#include "Workbench.h"
#include "qrc_Points.cpp"
// use a different name to CreateCommand()
void CreatePointsCommands(void);

View File

@@ -32,9 +32,9 @@ SET(Dialogs_SRCS
)
SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
fc_add_resources(Resource_SRCS Resources/Points.qrc)
qt4_add_resources(Resource_SRCS Resources/Points.qrc)
SET(Resource_SRCS
# ${Resource_SRCS}
${Resource_SRCS}
Resources/Points.qrc
)
SOURCE_GROUP("Resource" FILES ${Resource_SRCS})

View File

@@ -32,7 +32,6 @@
#include "DlgSettingsRayImp.h"
#include "ViewProvider.h"
#include "Workbench.h"
#include "qrc_Raytracing.cpp"
using namespace RaytracingGui;

View File

@@ -43,8 +43,9 @@ set(RaytracingGui_MOC_HDRS
fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})
SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})
fc_add_resources(Resource_SRCS Resources/Raytracing.qrc)
qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc)
SET(Resource_SRCS
${Resource_SRCS}
Resources/Raytracing.qrc
)
SOURCE_GROUP("Resource" FILES ${Resource_SRCS})

View File

@@ -28,7 +28,6 @@
#include "UnitTestPy.h"
#include "UnitTestImp.h"
#include "qrc_Test.cpp"
#include <Gui/Language/Translator.h>
#include <Base/Console.h>

View File

@@ -30,9 +30,9 @@ SET(Dialogs_SRCS
)
SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
fc_add_resources(Resource_SRCS Resources/Test.qrc)
qt4_add_resources(Resource_SRCS Resources/Test.qrc)
SET(Resource_SRCS
# ${Resource_SRCS}
${Resource_SRCS}
Resources/Test.qrc
)
SOURCE_GROUP("Resource" FILES ${Resource_SRCS})