mirror of https://github.com/CGAL/cgal
print out instructions on SoQt instead of just having compiler warning
This commit is contained in:
Daniel Russel
parent
68fbbbb19c
commit
dbcf1faf36
|
|
@ -151,8 +151,12 @@ int main(int argc, char *argv[])
|
|||
return qtsim->begin_event_loop();
|
||||
}
|
||||
#else
|
||||
bool app_3d_gui_compiled_without_CGAL_USE_SOQT_defined;
|
||||
return 0;
|
||||
std::cout << "An install of Inventor and SoQt are required for this demo. "
|
||||
"Please make sure they are installed and then compile "
|
||||
"using the makefile 'makefile.soqt'.\n"
|
||||
"They can be found at http://www.coin3d.org or as an rpm from "
|
||||
"your linux distribution (they are part of Fedora extras, for example).\n";
|
||||
return EXIT_FAILURE;
|
||||
#endif
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,7 +113,11 @@ int main(int argc, char *argv[])
|
|||
kdel->set_has_certificates(true);
|
||||
return qtsim->begin_event_loop();
|
||||
#else
|
||||
bool Delaunay_triangulation_3_compiled_without_CGAL_USE_SOQT_defined;
|
||||
std::cout << "An install of Inventor and SoQt are required for this demo. "
|
||||
"Please make sure they are installed and then compile "
|
||||
"using the makefile 'makefile.soqt'.\n"
|
||||
"They can be found at http://www.coin3d.org or as an rpm from "
|
||||
"your linux distribution (they are part of Fedora extras, for example).\n";
|
||||
return EXIT_FAILURE;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
# Created by the script cgal_create_makefile
|
||||
# This is the makefile for compiling a CGAL application.
|
||||
|
||||
#---------------------------------------------------------------------#
|
||||
# include platform specific settings
|
||||
#---------------------------------------------------------------------#
|
||||
# Choose the right include file from the <cgalroot>/make directory.
|
||||
|
||||
# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
|
||||
|
||||
include $(CGAL_MAKEFILE)
|
||||
|
||||
#---------------------------------------------------------------------#
|
||||
# compiler flags
|
||||
#---------------------------------------------------------------------#
|
||||
|
||||
CXXFLAGS = -g \
|
||||
-I$(CGAL_INCL_DIR) \
|
||||
$(CGAL_CXXFLAGS) \
|
||||
-Iinclude\
|
||||
$(LONG_NAME_PROBLEM_CXXFLAGS)
|
||||
|
||||
#---------------------------------------------------------------------#
|
||||
# linker flags
|
||||
#---------------------------------------------------------------------#
|
||||
|
||||
LIBPATH = \
|
||||
$(CGAL_LIBPATH)
|
||||
|
||||
LDFLAGS = \
|
||||
$(LONG_NAME_PROBLEM_LDFLAGS) \
|
||||
$(CGAL_LDFLAGS)
|
||||
|
||||
QT_LDFLAGS = \
|
||||
$(LONG_NAME_PROBLEM_LDFLAGS) \
|
||||
$(CGAL_QT_LDFLAGS)
|
||||
|
||||
#---------------------------------------------------------------------#
|
||||
# target entries
|
||||
#---------------------------------------------------------------------#
|
||||
|
||||
all: \
|
||||
Delaunay_triangulation_2$(EXE_EXT) \
|
||||
Delaunay_triangulation_3$(EXE_EXT) \
|
||||
2d_gui$(EXE_EXT) \
|
||||
3d_gui$(EXE_EXT) \
|
||||
generate_data$(EXE_EXT) \
|
||||
Delaunay_triangulation_stable_subset_2$(EXE_EXT) \
|
||||
regular_triangulation_3$(EXE_EXT)
|
||||
|
||||
|
||||
|
||||
generate_data$(EXE_EXT): generate_data$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)generate_data generate_data$(OBJ_EXT) $(LDFLAGS)
|
||||
|
||||
|
||||
Delaunay_triangulation_2$(EXE_EXT): Delaunay_triangulation_2$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_2 Delaunay_triangulation_2$(OBJ_EXT) $(QT_LDFLAGS)
|
||||
|
||||
Delaunay_triangulation_3$(EXE_EXT): Delaunay_triangulation_3$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_3 Delaunay_triangulation_3$(OBJ_EXT) $(LDFLAGS)
|
||||
|
||||
Delaunay_triangulation_stable_subset_2$(EXE_EXT): Delaunay_triangulation_stable_subset_2$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_stable_subset_2 Delaunay_triangulation_stable_subset_2$(OBJ_EXT) $(QT_LDFLAGS)
|
||||
|
||||
regular_triangulation_3$(EXE_EXT): regular_triangulation_3$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)regular_triangulation_3 regular_triangulation_3$(OBJ_EXT) $(LDFLAGS)
|
||||
|
||||
2d_gui$(EXE_EXT): 2d_gui$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)2d_gui 2d_gui$(OBJ_EXT) $(QT_LDFLAGS)
|
||||
|
||||
3d_gui$(EXE_EXT): 3d_gui$(OBJ_EXT)
|
||||
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)3d_gui 3d_gui$(OBJ_EXT) $(LDFLAGS)
|
||||
|
||||
clean: \
|
||||
2d_gui.clean \
|
||||
3d_gui.clean \
|
||||
generate_data.clean \
|
||||
Delaunay_triangulation_2.clean \
|
||||
Delaunay_triangulation_3.clean \
|
||||
Delaunay_triangulation_stable_subset_2.clean \
|
||||
regular_triangulation_3.clean
|
||||
|
||||
#---------------------------------------------------------------------#
|
||||
# suffix rules
|
||||
#---------------------------------------------------------------------#
|
||||
|
||||
.C$(OBJ_EXT):
|
||||
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
|
||||
|
||||
|
|
@ -65,7 +65,11 @@ int main(int argc, char *argv[])
|
|||
|
||||
return qtsim->begin_event_loop();
|
||||
#else
|
||||
bool regular_triangulation_3_compiled_without_CGAL_USE_SOQT_defined;
|
||||
std::cout << "An install of Inventor and SoQt are required for this demo. "
|
||||
"Please make sure they are installed and then compile "
|
||||
"using the makefile 'makefile.soqt'.\n"
|
||||
"They can be found at http://www.coin3d.org or as an rpm from "
|
||||
"your linux distribution (they are part of Fedora extras, for example).\n";
|
||||
return EXIT_FAILURE;
|
||||
#endif
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue