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

auto_link.h now centralized and moved into CGAL/auto_link/ folder. 

New line at EOF issues in new headers fixed.
This commit is contained in:
Fernando Cacciola 2007-03-01 20:15:24 +00:00
parent 6b5aaed1a0
commit a06fa41cb9
8 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Installation/include/CGAL/auto_link.h
View File

@ -1,30 +0,0 @@
// Copyright (c) 2007 GeometryFactory (France). All rights reserved.
//
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; version 2.1 of the License.
// See the file LICENSE.LGPL distributed with CGAL.
//
// Licensees holding a valid commercial license may use this file in
// accordance with the commercial license agreement provided with the software.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL$
// $Id$
//
//
// Author(s) : Fernando Cacciola (fernando.cacciola@geometryfactory.com)
//
// This file is for non-windows compilers running in non-windows platforms (such as cl.exe via cygwin)
// The real file (for MSVC) is in /CGAL/config/msvc/CGAL/auto_link.h
//
#if defined(CGAL_LIB_NAME)
# undef CGAL_LIB_NAME
#endif
#if defined(CGAL_AUTO_LINK_NOMANGLE)
# undef CGAL_AUTO_LINK_NOMANGLE
#endif

10
Installation/include/CGAL/auto_link/CGAL.h
View File

@ -1,8 +1,4 @@
// Copyright (c) 2007 Utrecht University (The Netherlands),
// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
// and Tel-Aviv University (Israel). All rights reserved.
// Copyright (c) 2007 GeometryFactory (France). All rights reserved.
//
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as
@ -25,6 +21,6 @@
#define CGAL_AUTO_LINK_CGAL_H
#define CGAL_LIB_NAME CGAL
#include <CGAL/auto_link.h>
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_AUTO_LINK_CGAL_H
#endif // CGAL_AUTO_LINK_CGAL_H

6
Installation/include/CGAL/auto_link/CGALQt.h
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007 GeometryFactory (France). All rights reserved.
// Copyright (c) 2007 GeometryFactory (France). All rights reserved.
//
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as
@ -21,6 +21,6 @@
#define CGAL_AUTO_LINK_CGALQT_H
#define CGAL_LIB_NAME CGALQt
#include <CGAL/auto_link.h>
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_AUTO_LINK_CGALQT_H
#endif // CGAL_AUTO_LINK_CGALQT_H

4
Installation/include/CGAL/auto_link/CORE.h
View File

@ -21,6 +21,6 @@
#define CGAL_AUTO_LINK_CORE_H
#define CGAL_LIB_NAME core++
#include <CGAL/auto_link.h>
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_AUTO_LINK_CORE_H
#endif // CGAL_AUTO_LINK_CORE_H

4
Installation/include/CGAL/auto_link/GMP.h
View File

@ -22,6 +22,6 @@
#define CGAL_AUTO_LINK_NOMANGLE
#define CGAL_LIB_NAME gmp
#include <CGAL/auto_link.h>
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_AUTO_LINK_GMP_H
#endif // CGAL_AUTO_LINK_GMP_H

4
Installation/include/CGAL/auto_link/MPFR.h
View File

@ -22,6 +22,6 @@
#define CGAL_AUTO_LINK_NOMANGLE
#define CGAL_LIB_NAME mpfr
#include <CGAL/auto_link.h>
#include <CGAL/auto_link/auto_link.h>
#endif // CGAL_AUTO_LINK_MPFR_H
#endif // CGAL_AUTO_LINK_MPFR_H

3
wininst/include/CGAL/config/msvc/CGAL/auto_link.h → Installation/include/CGAL/auto_link/auto_link.h
View File

@ -307,6 +307,8 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used,
#endif // _MSC_VER || __BORLANDC__
#endif // CGAL_NO_AUTOLINK
//
// finally undef any macros we may have set:
//
@ -334,7 +336,6 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used,
# undef CGAL_LIB_FULL_NAME
#endif
#endif // CGAL_NO_AUTOLINK

6
Installation/install_cgal
View File

@ -822,7 +822,7 @@ set_compiler_flags()
case ${CGAL_OS_COMPILER} in
*bcc32.exe*|*BCC32*)
#### settings Borland C++ compiler
ADDITIONAL_CXXFLAGS="-P -vi- -w-inl"
ADDITIONAL_CXXFLAGS="-P -vi- -w-inl -DCGAL_NO_AUTOLINK"
CGAL_LIB_CXXFLAGS="-P"
CGAL_STATIC_LIB_CREATE="tlib /C /P512 ''"
CGAL_OBJ_PREFIX="+"
@ -845,7 +845,7 @@ set_compiler_flags()
#### settings Intel C++ compiler
WINDOWS_COMPILER="y"
CYGWIN_COMPILER="y"
ADDITIONAL_CXXFLAGS="-Op -TP -GR -EHsc -Zm900 -nologo -Zc:wchar_t -Zc:forScope -MD"
ADDITIONAL_CXXFLAGS="-Op -TP -GR -EHsc -Zm900 -nologo -Zc:wchar_t -Zc:forScope -MD -DCGAL_NO_AUTOLINK"
ADDITIONAL_LDFLAGS="-nologo"
# CGAL_LIB_CXXFLAGS="-TP"
CGAL_STATIC_LIB_CREATE="LIB /OUT:"
@ -869,7 +869,7 @@ set_compiler_flags()
#### settings Microsoft Visual C++ compiler
WINDOWS_COMPILER="y"
CYGWIN_COMPILER="y"
ADDITIONAL_CXXFLAGS="-TP -GR -EHsc -Zm900 -nologo -MD"
ADDITIONAL_CXXFLAGS="-TP -GR -EHsc -Zm900 -nologo -MD -DCGAL_NO_AUTOLINK"
ADDITIONAL_LDFLAGS="-nologo"
# CGAL_LIB_CXXFLAGS="-TP"
CGAL_STATIC_LIB_CREATE="LIB /OUT:"