Commit Graph

180 Commits

Author SHA1 Message Date
Marc Glisse dc3364c65a Basics for sunpro on linux-x86. I will touch FPU.h again later. 2007-03-19 18:25:06 +00:00
Joachim Reichel 78deced48d add missing definitions for shared libraries on *alpha*Linux*g++* 2007-03-19 17:07:22 +00:00
Joachim Reichel 10a1be523a print version number of supported libraries (if known) 2007-03-19 17:02:55 +00:00
Laurent Rineau 2408837793 Fix getconf call: `getconf PATH` is more standard than `getconf CS_PATH`
(Single Unix Specification version 3).
2007-03-19 07:46:40 +00:00
Joachim Reichel 0cbdfe9716 install makefile as $(CGAL_INSTALL_DIR)/share/cgal/makefile
do not install unused subdirectory $(CGAL_INSTALL_DIR)/include/CGAL/config
2007-03-18 11:56:46 +00:00
Joachim Reichel 55438c8c8e fix invocation of _check_for_util from _check_for_sysutil (the former
was looking for a program 'gmake n MAKE' instead of 'gmake')
2007-03-18 10:28:58 +00:00
Daniel Russel f1f153c176 added auto compiler determination to ni, made ni default (removed auto), suppressed warnings when missing config file, cleaned up print out when the config is found 2007-03-16 19:29:11 +00:00
Laurent Rineau db7b7eaf97 Special gift feature for Andreas Fabri: the last line of the output of
install_cgal can now be copy pasted in the shell.

E.g.:

  **   WARNING: You did not build any libs during this session. **
  **     If something went wrong, (or maybe also, if not:)      **
  **                have a look at install.log.                 **
  ****************************************************************

Remember to set the CGAL_MAKEFILE environment variable, e.g.:
export CGAL_MAKEFILE="/usr/share/CGAL/make/makefile"
2007-03-16 16:10:53 +00:00
Laurent Rineau 38ff402c77 Quote more, in the display of "set to ..." in try_to_get_var_from_config_file().
A single quote prevents the shell from interpreting the string.
2007-03-16 15:43:20 +00:00
Laurent Rineau 0eba620f11 - minor modifications of _check_for_(sys)?util():
- one can set variables NO_<utility> (like NO_printf for example) to see
     what happens if an utility is missing (I like using NO_tput=y, for
     example),
   - use of value_of() instead of two eval.
- Add a message at the beginning of the search of POSIX utilities. On
  Cygwin it can take some time.
- Search for GNU/make only in startup (no need for it to see 
  `install_cgal --help`).
- Remove a slash in CGAL_MAKE_DIR.
2007-03-16 15:40:46 +00:00
Laurent Rineau 8a67f904d9 Fix for platforms that do not have 'getconf'.
The trick: use "_check_for_util getconf", before uses of check_for_sysutil.

Tested on Linux and Solaris.
2007-03-14 21:38:18 +00:00
Laurent Rineau 7935f735e0 - Fix _bc_expr() (broken since the beginning of times, probably never used).
- Fix _search_compiler() (I had broken the latter a week ago, with revision
  36838).

- Better function _check_for_sysutil(): it now uses `getconf CS_PATH` to
  search for POSIX utilities in standard directories. If should fix
  install_cgal on Solaris (tested on Linux and Solaris).

- check_for_utils() is now call as soon as possible, to get a POSIX awk
  before the parsing of support config files.

- Fix calls to any utility without using a variable ${_foobar}. Now, only
  the following utilities are used directly:
    /bin/basename
    /bin/date
2007-03-14 19:51:52 +00:00
Laurent Rineau 6d542045f9 Make keys case-insensitive in support_feature_menu(), like in other menus. 2007-03-14 09:42:58 +00:00
Joachim Reichel 4f47903a25 moved src/Core to src/CGALCore
moved include/CORE to include/CGAL/CORE
moved include/OpenNL to include/CGAL/OpenNL
renamed libcore++ to libCGALcore++
2007-03-13 18:10:39 +00:00
Joachim Reichel cd1a040d2e remove -w and -g option of install_cgal
remove makefile variables CGAL_WINDOW_LDFLAGS, CGAL_GEOWIN_LDFLAGS and CGAL_QT_LDFLAGS
(see #1894)
2007-03-09 22:53:24 +00:00
Laurent Rineau 1d90e12229 Allows MAKE="make -j2" ./install_cgal... 2007-03-09 10:28:32 +00:00
Sylvain Pion cb13268b22 Initialize _grep to grep.
Improve detection of PGCC (pgCC or pgcpp).
2007-03-08 17:12:26 +00:00
Laurent Rineau efeb130fad Fix real_which, which was quite stupide. :-) 2007-03-08 10:00:25 +00:00
Laurent Rineau a83c9d3f3a - Repair the detection of GNU make.
- New variables _touch and _grep.
- Check the use of variables ${_util} instead of "util" directly (for
  util=grep,touch,cat,rm).
- Use ${CUSTOM_CXXFLAGS} for tests also.
2007-03-07 10:21:48 +00:00
Laurent Rineau 65ed13d8c9 New test for gmake.
Add /opt/sfw/bin to standard places (Solaris).
Change the meaning of $3 in _check_for_util and _check_for_sysutil.
2007-03-06 09:21:05 +00:00
Sylvain Pion 5994cd4e35 remove buggy the in last commit 2007-03-05 17:59:10 +00:00
Sylvain Pion 39a14e92b8 Add to --help the following : --with-PACKAGE, --PACKAGE_INCL_DIR, --PACKAGE_LIB_DIR. 2007-03-05 17:58:11 +00:00
Laurent Saboret 646b0feaa7 try_to_get_var_from_file() supports now several '=' characters on a line 2007-03-05 11:00:07 +00:00
Laurent Rineau a3fe48756a Fix the comment of try_to_get_var_from_file_aux(). 2007-03-03 16:30:51 +00:00
Laurent Rineau 972fc4250a Optimization:
- printf is a POSIX shell builtin, so _check_for_sysutil should not be
    called for printf

That optimization avoids more than 15000 forks, during an execution of
    ./install_cgal -i
2007-03-03 16:17:07 +00:00
Laurent Rineau c6fe655d14 Optimizations:
- new implementation of try_to_get_var_from_file() and
    try_to_get_var_from_config_file() that allows to parse a whole file at
    once,
  - new implementation of parse_support_options(), that parse each config
    file at whole.
2007-03-03 15:54:41 +00:00
Laurent Rineau c115b38748 Fix last patch rev36791: i forgot two characteres `". 2007-03-03 15:10:53 +00:00
Laurent Rineau 59d45d51af Optimisation: POSIX awk has a function toupper, so no need to pipe it in
${_tr} '[:lower:]' '[:upper:]'.
2007-03-03 14:26:14 +00:00
Sylvain Pion 623020b3ae minor (8%) optimization of the number of calls to tr 2007-03-02 12:58:15 +00:00
Daniel Russel d46a6f58b6 auto install things if no action is specified 2007-03-01 23:43:54 +00:00
Daniel Russel 716be153c6 fixed dylib path on macs, and the makefile is now in make/CGAL and everything is now installed properly. 2007-03-01 23:43:20 +00:00
Fernando Cacciola a06fa41cb9 auto_link.h now centralized and moved into CGAL/auto_link/ folder.
New line at EOF issues in new headers fixed.
2007-03-01 20:15:24 +00:00
Laurent Rineau 467deadec0 Attempt to restore dylibs on Darwin. 2007-02-27 22:12:02 +00:00
Laurent Rineau 7c0add8a8e Test $MAKE even if MAKE=gmake 2007-02-27 22:10:08 +00:00
Laurent Rineau d633b8c7bd - SHARED_LIB_EXT->CGAL_SHARED_LIB_EXT
- printf -> ${_printf} is some places
- display the make command option, in compile.log
2007-02-26 18:16:38 +00:00
Laurent Saboret ab77efc7e1 _test_support() tries to locate third-party libraries (using STDLIBDIRS and LIBTHING) even when STDINCLDIRS and INCLTHING fields are empty) 2007-02-23 15:27:50 +00:00
Daniel Russel e503360191 removed ref to dylib as linking broken when libraries were called foo.dylib, but worked with foo.so--now it is the same as before, except that the install works 2007-02-23 01:02:13 +00:00
Laurent Rineau 8862a968af - fix ADDITIONNAL->ADDITIONAL
- fix flags for Core and CGALQt shared libraries
- add $(CUSTOM_LDFLAGS) to $(CGAL_SHARED_LIB_LDFLAGS)
- move a few flags from $(CGAL_CGAL_LDFLAGS) to $(CGAL_LDFLAGS), so that
  $(CGAL_CGAL_LDFLAGS) only contains -lCGAL (or the equivalent for other
  compilers).
2007-02-23 00:07:51 +00:00
Daniel Russel 9c0306f242 put back SHARED_LIB_EXT and exported it to the makefile to fix an error message on macs 2007-02-22 22:38:28 +00:00
Daniel Russel 1786c9ca1a Use environment CPPFLAGS in addition to CXXFLAGS and don't overwrite the flags when there is no config file. The first change is harmless. The second involves changing the behaviour of the try_to_get_... functions to not clear the variable when they can't load it. I added code to clear the variable before loading when processing for multiple platforms (since it would have been either loaded or cleared anyway), but I haven't been able to check this so thoroughly 2007-02-22 06:54:49 +00:00
Laurent Rineau 6f5296e701 Tiny fix: "untabify" my last patch. 2007-02-21 18:14:36 +00:00
Laurent Rineau 3360cae266 Dirty hack: regenerate the include makefile, so that linker flags of libraries that
failed to compile are not included in CGAL_LDFLAGS.
2007-02-21 18:00:55 +00:00
Laurent Rineau 9d879f7e6b In CGAL_LDFLAGS, include only flags for libraries that have been compiled
correctly, at least in one flavour between "shared" and "static".

We do not want the testsuite to be red if only one library is broken.
2007-02-21 17:22:43 +00:00
Laurent Rineau 2239698314 Make $(CUSTOM_CXXFLAGS) be *after* -I$(CGAL_INCL_DIR). 2007-02-21 16:28:57 +00:00
Laurent Rineau 01b2e6fdb2 Fix CGALPDB->libCGALPDB, so that CGALPDB is shown with other libraries in
the testsuite, at the bottom of the array.
2007-02-21 01:16:47 +00:00
Daniel Russel 8f56c8ae0e added build of PDB 2007-02-19 04:55:10 +00:00
Andreas Meyer 924c3cc2fb replaced [[ "a" = "b" ]] by [ "a" = "b" ]
(caused a "missing [[ command" error before)
2007-02-17 21:26:42 +00:00
Laurent Rineau ca7f173838 - Add cxx flags, libpath flags and linker flags, by features, in
$CGAL_MAKEFILE.
- Fix shared libraries makefile that need to be linked with third libraries.
2007-02-16 23:00:26 +00:00
Laurent Rineau 4119696cd6 Use -fPIC of Linux, and -PIC on SunOS, instead of small model
equivalents (-fpic/-PIC).
This breaks the binary compatibility.
2007-02-16 21:10:12 +00:00
Laurent Rineau 36636d49b5 - Continue factorization between libraries' makefiles,
- install_cgal cleanup.
2007-02-16 21:00:37 +00:00
Laurent Rineau 53d2c7ce8d - Attempt to fix the make detection on Solaris.
- Fix the Installation module of the testsuite: install.log is now shown entirely.
2007-02-16 18:04:57 +00:00
Efi Fogel bef9456334 used GNU Make 2007-02-15 11:53:18 +00:00
Michael Hoffmann 1328f5e2bb Fixed soname option for Sunpro. 2007-02-12 10:15:13 +00:00
Laurent Rineau 72f5a0baec Fix the copyright (years range). 2007-02-11 22:07:00 +00:00
Laurent Rineau bea7da0780 Fix the testsuite outputs for libraries builds 2007-02-11 21:53:18 +00:00
Laurent Rineau 2a6044d966 Fix SONAME support for SunPro CC (Solaris):
use "-h" directly, instead of "-Wl,-h,"
2007-02-11 20:01:25 +00:00
Laurent Rineau 351e57621a Add SONAME support for Irix and Solaris, based on:
http://www.fortran-2000.com/ArnaudRecipes/sharedlib.html
2007-02-10 01:09:02 +00:00
Laurent Rineau 4c484412e4 (Followup to revision 36164.)
"Everybody was dreaming of this commit log:
 - factorization of makefiles for libCGAL, libCGALimageIO, libCore, and
 libBenchmark.
 - SONAMEs for everybody."
Add:
 - fix platforms without SONAME,
 - unify Benchmark/src/Benchmark/makefile with other makefiles.
2007-02-09 23:33:22 +00:00
Laurent Rineau 5465b2aec8 One can build the four shared libraries on Darwing, now. No special treatment 2007-02-09 22:27:37 +00:00
Laurent Rineau 04f803305f One can now disable static libraries in interactive mode.
(Reminder: --disable-static in non-interactive mode.)
2007-02-09 22:26:00 +00:00
Michael Hoffmann d55b10b759 Remove OPENGL_LIBS and test for it as a separate feature. 2007-02-07 15:46:51 +00:00
Efi Fogel c6e5125616 Fixes for Windows: 1. Allowed specifying cl as the compiler (and not only cl.exe). 2. Fixed installing into a separate directory 2007-02-07 11:26:32 +00:00
Laurent Rineau 6c6cbdcb1c The commit that will break everthing:
- New library: libCGALimageIO
- make shared libraries for CORE, and Benchmark.
2007-02-02 16:10:06 +00:00
Andreas Meyer 4ec2c7f37f testsuite webpage now has entries for libCGAL* 2007-01-11 22:32:08 +00:00
Marc Glisse 8a4899c67d Add .cpp to .SUFFIXES. 2007-01-09 18:34:10 +00:00
Marc Glisse ef0af08640 ! [ -n "..." ] corrected to:
[ ! -n "..." ] and actually to:
[ -z "..." ]
in a shell script.
2007-01-05 17:55:06 +00:00
Laurent Rineau 652de4ef9f Problems with shared libraries under Darwin: only libCGAL can be compiled shared. 2006-11-09 12:59:38 +00:00
Laurent Rineau 7670f12222 Add the new option --disable-static to the result of --help 2006-11-08 17:06:15 +00:00
Laurent Rineau 0e713f8f29 - add support for shared libCGALQt
- enable option "--disable-shared" in install_cgal (non interractive mode only)
2006-11-08 16:43:48 +00:00
Efi Fogel 331e6aa945 Enabled the production of the CGALBenchmakr library 2006-10-12 17:53:05 +00:00
Sylvain Pion 87c173093e Update list of supported compilers.
( The main goal is to warn users of old compilers,
  not to afraid users new ones for not much. )
2006-09-22 08:30:03 +00:00
Andreas Meyer 1151a0e3f3 fix: support for leda specfiles 2006-07-20 13:29:54 +00:00
Sylvain Pion b77f79a65a Rename ${TMP_CXX_FILE}.C to ${TMP_CXX_FILE}.cpp 2006-07-12 19:06:16 +00:00
Sylvain Pion 5a1d4b985b - Create a new file $CGAL/VERSION which contains the version
number and no carriage return.
- Use it in install_cgal instead of parsing <CGAL/version.h>.
2006-07-12 10:01:06 +00:00
Sylvain Pion e4cd943786 - Rename config/support/test*.C to .cpp 2006-07-12 09:26:22 +00:00
Sylvain Pion 5d166afa1b Renamed config/testfiles/*.C to .cpp 2006-07-12 09:03:57 +00:00
Andreas Fabri 07fb9cf289 Added suffix rules for cleaning .cpp files 2006-06-15 10:46:39 +00:00
Sylvain Pion 06071bf82b Do not take $CXX into account (conflict) if the compiler
is passed on the command-line.
2006-05-22 13:57:10 +00:00
Michael Hoffmann c1a946b418 Fixed bug reported by Joachim, CXXFLAGS/LDFLAGS during 3rd party
support file reading overwrite environment variables.
Fixed bug in logfile initialization.
2006-05-19 08:00:29 +00:00
Laurent Saboret 952bf33945 Fixed bug on Solaris 2.6 with tr:
- tr arguments must be quoted
- [ and ] regular characters must be protected by a backslash
2006-05-10 11:04:17 +00:00
Laurent Saboret f79f707883 Complete rewrite of TAUCS support. Windows, Linux and Darwin are tested. Other platforms are supported but not yet tested. 2006-05-09 16:16:39 +00:00
Michael Hoffmann 064e4fbb8c Search for install_name_tool after OS_COMPILER is defined. 2006-04-24 08:30:26 +00:00
Laurent Saboret fc15e54f87 Use multithreaded DLL runtime with Visual C++ and Intel compiler (-MD) 2006-04-21 14:34:07 +00:00
Michael Hoffmann c4459c8a49 Commented CGAL_MAKEFILE replacement for example/test makefiles.
(Was not effective, anyway..)
2006-04-20 17:44:44 +00:00
Michael Hoffmann 2b3e66f6d7 Name Install Menu. 2006-04-20 09:19:35 +00:00
Sylvain Pion 00eda9d67b Redo the CGAL_SHARED_LIB_INSTALL_NAME change, as it is needed
when no "install" procedure is run.
2006-04-19 21:05:39 +00:00
Sylvain Pion 8fa59948d4 Undo r29804 (CGAL_SHARED_LIB_INSTALL_NAME) as a better
approach is there now.
2006-04-19 15:43:21 +00:00
Michael Hoffmann f75c90a48a Add buildlog to install.log, even in case of success. 2006-04-19 15:19:15 +00:00
Michael Hoffmann e392b3f7ea Use install_name_tool to correct sharedlibnames on Darwin. 2006-04-18 14:26:28 +00:00
Michael Hoffmann f26644d94f Give reasonable error msg when parsing BUILD_ONE_CONFIG. 2006-04-18 11:45:49 +00:00
Sylvain Pion 0d0aad83ea In create_standard_header_replacements(), do a first test with
all std headers included at once, to avoid the loop over all
individual headers (speed up).
2006-04-17 09:54:39 +00:00
Sylvain Pion eed6175a1d Undo r30319 as it was not the cause of the armageddon. 2006-04-15 16:23:50 +00:00
Sylvain Pion 601e136909 - Undo r30288 as it is probably the cause of buggy test-suite. 2006-04-14 13:00:41 +00:00
Sylvain Pion 0ef9da253a Progress towards libraries makefile factorization 2006-04-13 23:42:26 +00:00
Sylvain Pion 22ad725de1 Move src/*.C to src/CGAL/*.C 2006-04-13 22:24:18 +00:00
Sylvain Pion c1373346f2 Merge src/makefile_lib and src/makefile_sharedlib into src/makefile.
This required to pass CXXFLAGS on the make command-line, and therefore
I took this opportunity to also pass CGAL_MAKEFILE on the command-line,
which in turn allowed to get rid of the prepare_lib_makefiles function.
2006-04-13 22:02:29 +00:00
Michael Hoffmann cf96be9ae6 Print supported libs on multiple lines in interactive menu. 2006-04-13 13:14:47 +00:00
Laurent Rineau 3e26709e52 make lib_menu exit if the setup is not correct, in non-interactive mode. 2006-04-13 11:45:42 +00:00
Michael Hoffmann 4b48954bb1 Output feature not package name when testing. 2006-04-11 13:02:56 +00:00
Michael Hoffmann f32a974f9a Cleanup of XLIBS and WINDOW_DIR (unused).
Introduce CGAL_CGAL_LDFLAGS.
2006-04-11 09:19:18 +00:00