songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

demo/Alpha_shapes_2 is now compilable using cmake. 

As a matter of fact, that will break non-cmake testsuite (because of
This commit is contained in:
Laurent Rineau 2008-09-08 13:10:50 +00:00
parent 21280436c2
commit 522bb37c34
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Alpha_shapes_2/demo/Alpha_shapes_2/CMakeLists.txt
View File

@ -7,9 +7,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
find_package(CGAL REQUIRED Qt3 ) find_package(CGAL REQUIRED Qt3 )
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
find_package(Qt3 REQUIRED)
# use the Qt MOC preprocessor on classes that derives from QObject # use the Qt MOC preprocessor on classes that derives from QObject
include( Qt3Macros ) include( Qt3Macros )
qt3_generate_moc( Qt_widget_move_point.h Qt_widget_move_point.moc ) qt3_generate_moc( Qt_widget_move_point.h Qt_widget_move_point.moc )
@ -20,7 +21,8 @@ qt3_generate_moc( alpha_shapes_2.cpp alpha_shapes_2.moc )
# The executable itself. # The executable itself.
add_executable ( alpha_shapes_2 add_executable ( alpha_shapes_2
Qt_widget_move_point.cpp Qt_widget_move_point.moc alpha_shapes_2.cpp alpha_shapes_2.moc
Qt_widget_move_point.cpp Qt_widget_move_point.moc
Qt_widget_toolbar.cpp Qt_widget_toolbar.moc Qt_widget_toolbar.cpp Qt_widget_toolbar.moc
Qt_widget_toolbar_layers.cpp Qt_widget_toolbar_layers.moc ) Qt_widget_toolbar_layers.cpp Qt_widget_toolbar_layers.moc )

4
Alpha_shapes_2/demo/Alpha_shapes_2/Qt_widget_move_point.cpp
View File

@ -20,8 +20,6 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#ifdef CGAL_USE_QT
#include "Qt_widget_move_point.h" #include "Qt_widget_move_point.h"
void Qt_widget_movepoint_helper::delete_point() { delete_pointi(); }; void Qt_widget_movepoint_helper::delete_point() { delete_pointi(); };
@ -33,5 +31,3 @@ void Qt_widget_movepoint_helper::stateChanged(int i){
deactivate(); deactivate();
} }
#include "Qt_widget_move_point.moc" #include "Qt_widget_move_point.moc"
#endif

4
Alpha_shapes_2/demo/Alpha_shapes_2/Qt_widget_toolbar.cpp
View File

@ -19,8 +19,6 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#ifdef CGAL_USE_QT
#include <CGAL/IO/Qt_widget.h> #include <CGAL/IO/Qt_widget.h>
#include "Qt_widget_toolbar.h" #include "Qt_widget_toolbar.h"
@ -82,5 +80,3 @@ Tools_toolbar::Tools_toolbar(CGAL::Qt_widget *w, QMainWindow *mw,
}; };
#include "Qt_widget_toolbar.moc" #include "Qt_widget_toolbar.moc"
#endif

3
Alpha_shapes_2/demo/Alpha_shapes_2/Qt_widget_toolbar_layers.cpp
View File

@ -20,8 +20,6 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#ifdef CGAL_USE_QT
#include "Qt_widget_toolbar_layers.h" #include "Qt_widget_toolbar_layers.h"
// icons // icons
@ -179,4 +177,3 @@ Layers_toolbar::Layers_toolbar(CGAL::Qt_widget *w, QMainWindow *mw,
#include "Qt_widget_toolbar_layers.moc" #include "Qt_widget_toolbar_layers.moc"
#endif