Put CORE_NO_AUTOMATIC_NAMESPACE directly in the .cpp file

This commit is contained in:
Andreas Fabri 2008-09-09 13:50:57 +00:00
parent 14c207fee6
commit 094e2cbdbb
2 changed files with 1 additions and 70 deletions

View File

@ -1,9 +1,7 @@
#include <CGAL/basic.h>
#define CORE_NO_AUTOMATIC_NAMESPACE 1
#ifdef CGAL_USE_CORE
#include <CGAL/CORE_Expr.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Delaunay_triangulation_2.h>
@ -29,14 +27,3 @@ int main() {
}
#else // CGAL_USE_CORE
#include <iostream>
int main()
{
std::cout << "Core is not installed" << std::endl;
return 0;
}
#endif // CGAL_USE_CORE

View File

@ -1,56 +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 = -I../../include -DCORE_NO_AUTOMATIC_NAMESPACE\
$(TESTSUITE_CXXFLAGS) \
$(EXTRA_FLAGS) \
$(CGAL_CXXFLAGS) \
$(LONG_NAME_PROBLEM_CXXFLAGS) \
$(DEBUG_OPT)
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LIBPATH = \
$(TESTSUITE_LIBPATH) \
$(CGAL_LIBPATH)
LDFLAGS = \
$(TESTSUITE_LDFLAGS) \
$(LONG_NAME_PROBLEM_LDFLAGS) \
$(CGAL_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: \
delaunay$(EXE_EXT)
delaunay$(EXE_EXT): delaunay$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)delaunay delaunay$(OBJ_EXT) $(LDFLAGS)
clean: \
delaunay.clean
#---------------------------------------------------------------------#
# suffix rules
#---------------------------------------------------------------------#
.cpp$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<