v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: fix buildCMake: fix build..

pull/1003/head^2
Kim Kulling 2016-09-10 08:48:01 +02:00
parent 95676b4db9
commit 7cedd4ab89
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -275,7 +275,6 @@ ENDIF ( ASSIMP_BUILD_COMPILER STREQUAL "")
MARK_AS_ADVANCED ( ASSIMP_BUILD_ARCHITECTURE ASSIMP_BUILD_COMPILER ) MARK_AS_ADVANCED ( ASSIMP_BUILD_ARCHITECTURE ASSIMP_BUILD_COMPILER )
SET ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER OFF CACHE BOOL SET ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER OFF CACHE BOOL
"Build the C4D importer, which relies on the non-free Melange SDK." "Build the C4D importer, which relies on the non-free Melange SDK."
) )

3
code/CMakeLists.txt
View File

@ -617,8 +617,6 @@ ADD_ASSIMP_IMPORTER( 3MF
D3MFOpcPackage.h D3MFOpcPackage.h
D3MFOpcPackage.cpp D3MFOpcPackage.cpp
) )
SOURCE_GROUP( 3MF FILES ${(3MF_SRCS})
SET( Step_SRCS SET( Step_SRCS
StepExporter.h StepExporter.h
@ -662,7 +660,6 @@ SET( Clipper_SRCS
) )
SOURCE_GROUP( Clipper FILES ${Clipper_SRCS}) SOURCE_GROUP( Clipper FILES ${Clipper_SRCS})
SET( Poly2Tri_SRCS SET( Poly2Tri_SRCS
../contrib/poly2tri/poly2tri/common/shapes.cc ../contrib/poly2tri/poly2tri/common/shapes.cc
../contrib/poly2tri/poly2tri/common/shapes.h ../contrib/poly2tri/poly2tri/common/shapes.h

4
tools/assimp_qt_viewer/main.cpp
View File

@ -10,11 +10,9 @@
// Header files, Qt. // Header files, Qt.
#include <QApplication> #include <QApplication>
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
QApplication a(argc, argv); QApplication a(argc, argv);
MainWindow w; MainWindow w;
w.show(); w.show();
return a.exec(); return a.exec();