Commit Graph

119 Commits

Author SHA1 Message Date
Eric Berberich 19fccf9969 more output 2012-01-10 14:36:42 +00:00
Eric Berberich 1c0474c1aa link only with GMP/MPFR and GMPXX if configured 2012-01-10 12:31:44 +00:00
Eric Berberich 48f9a4628f general use_lib for found libs must be used 2012-01-10 10:34:25 +00:00
Eric Berberich 0def3cb179 improved formatting 2012-01-10 10:17:43 +00:00
Eric Berberich 609ad2d43d for some reason CGAL lib needs GMP/MPFR (check includes!) 2012-01-10 10:17:27 +00:00
Laurent Rineau 099d46877e Bug-fix: really add the "lib" prefix for CGAL lib names on Windows 2011-10-28 12:14:01 +00:00
Laurent Rineau fc204cd04d Do not create the .rc file if not WIN32 2011-10-26 09:43:02 +00:00
Laurent Rineau 7c64fe7394 Add versioninfo to created DLLs. 2011-10-25 15:17:08 +00:00
Laurent Rineau a136c46405 Fix previous commit about new name mangling for Windows libraries 2011-10-21 14:46:12 +00:00
Laurent Rineau a49a4976a2 Change the name mangling of CGAL libraries, on Windows
We adopt the naming scheme of Boost libraries, with the "lib" prefix for
static libraries. And with the CGAL_VERSION as suffix.

For example, static libraries will be named:
  libCGAL_Qt4-vc100-mt-gd-3.10-Ic-123.lib
and DLL will be named:
  CGAL_Qt4-vc100-mt-gd-3.10-Ic-123.dll
2011-10-21 14:10:52 +00:00
Laurent Rineau c37ce187ff Factorize the settings of VERSION/SOVERSION properties of libraries 2011-10-19 15:53:46 +00:00
Laurent Rineau 9059b29647 Fix and factorize post-build commands on Windows
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.

For example, the definition of mangled names is now factorized in that
function.

Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
2011-10-17 16:02:12 +00:00
Laurent Rineau b28fb2f764 Remove debugging messages 2011-10-06 09:51:48 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Laurent Rineau 9daee5c42f Add link_directories during the CGAL library creation (needed for auto-linking
on Windows).
2011-10-05 09:51:35 +00:00
Laurent Rineau dbf3ace24b merge from next 2011-09-22 07:56:49 +00:00
Laurent Rineau fcfc1f5092 Bug-fix to the creation of all_files.cpp by CMake
It may happen that a file all_files.cpp had been created in-source by a
previous in-source build. We certainly do not want to include that file in
the new all_files.cpp, because .cpp files would be included twice, and that
breaks the one-definition rule (ODR).


Remember: in-source build is evil...
2011-09-06 12:54:37 +00:00
Eric Berberich 2466257f18 improved poutput 2011-04-20 14:33:38 +00:00
Laurent Rineau ff2044190d Fix the branch-build in next 2011-04-15 09:33:26 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Laurent Rineau 4a3b9888d6 Add a workaround in src/CMakeLists.txt, to avoid that a variable
WITH_CGAL_Core is copied from the reference cache, if Core is disabled
(on 64bits platforms).
2010-06-23 09:04:56 +00:00
Laurent Rineau 18f49da592 Merged revisions 56833 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56833 | lrineau | 2010-06-17 12:02:47 +0200 (Thu, 17 Jun 2010) | 4 lines
  
  Move the message "CGAL_Core needs GMP, cannot be configured." to the place
  where CGAL_NO_CORE is set. That is more compatible with the disabling of
  Core under 64 bits (on the trunk).
........
2010-06-17 10:04:25 +00:00
Sébastien Loriot d72337785c remove dependance on CGAL_PDB: merge from the branche created for that purpose
I do not remove the directory CGAL_PDB as I am allowed to use svn remove.
2010-06-10 17:26:38 +00:00
Michael Hemmer b379564462 mv Bbox_3 intersect with line/ray/segment to bbox_intersection_3.h file,
it must be a template function since it depends on the Kernel
rm Intersections_3/src/CGAL/Bbox_3_intersections.cpp since it is empty
2010-01-28 15:40:48 +00:00
Laurent Rineau f3078e4547 Quote the characters '"' in post-build commands. If TargetDir==C:\Program
Files\CGAL-3.4\, that is needed.
2008-12-16 14:47:16 +00:00
Laurent Rineau 38cbc3926c If GMP is not here, CGAL_Core cannot be compiled. 2008-12-03 13:57:18 +00:00
Andreas Fabri cb44718771 bye bye install_cgal 2008-12-01 10:08:29 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Laurent Rineau d256a634c3 Add src/CGAL/test_FPU_rounding_mode.cpp
That file creates a global (static const) object that:
  - at its creation (start of the program), it stores the FPU rounding mode,
  - at its destruction (end of the program), it emits a CGAL_warning is the
current rounding mode is different from the stored one.

That will permit to track if all CGAL kernel code restore the FPU rounding
mode correctly (needed for some CGAL user and GeometryFactory customers).
2008-10-15 12:53:41 +00:00
Sylvain Pion 1652fec82f Add license notice. 2008-10-13 12:46:01 +00:00
Laurent Rineau 533d5f7869 Fix a bug introduced in revision 45996: debug and release are swapped for
the CGAL library! I cannot understand how CGAL had been able to compile on
Windows with that bug!
2008-10-09 20:56:15 +00:00
Fernando Cacciola 6fdf8251bd Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-01 21:38:37 +00:00
Laurent Rineau 202d2b53ca Force variables CGAL_<component>_LIBRARY.
For an unkwnon reason, they are copied from the reference cache, which is wrong.
2008-09-29 10:09:35 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged).
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
2008-09-24 10:32:44 +00:00
Laurent Rineau d97c78b177 Include CGALQt4 in the libraries compilation stuff.
We need to create a (potentially incomplete) CGALConfig.cmake file after
the CGAL library has been built.
2008-09-09 12:19:41 +00:00
Fernando Cacciola ee6fae2991 Added separation in components 2008-09-03 16:55:21 +00:00
Fernando Cacciola 717b7cf5fb soversion added 2008-08-22 22:25:25 +00:00
Fernando Cacciola db331e146d Fix CGALCore ON/OFF switch to be WITH_CGALCore and not CGAL_USE_CGAL_CORE 2008-08-22 18:20:41 +00:00
Michael Hemmer cff191916d changed name: CGAL::Modular -> CGAL::Residue
chnaged filenames accordingly 
changed: Modular_traits::Modular_NT -> Modular_traits::Residue_type
2008-08-04 15:09:13 +00:00
Fernando Cacciola 89b07886e5 Removed CMake as a standalone "package" (now part of Installation and others) 2008-07-18 14:23:08 +00:00
Fernando Cacciola 6e36eda87b CMake stuff moved into the appropriate packages 2008-07-16 20:56:17 +00:00
Michael Hemmer ef862d658e added primes.h/.cpp (contains precomputed primes) 2008-03-31 12:50:54 +00:00
Sylvain Pion 8f2923b807 It seems like the "window" package is completely obsolete: it contains
only the cgal_logo symbol in libCGAL, which is unsued anymore.
2008-01-10 18:17:46 +00:00
Sylvain Pion eade497e29 Missing ";" preventing building of Benchmark lib on Darwin. 2007-08-06 11:25:59 +00:00
Sebastian Limbach f957ba237d Modular_type.cpp added to resolve linkage errors in the Modular_arithmetic package. 2007-08-01 10:34:39 +00:00
Sylvain Pion f6aad48a3c Allow compiling all source files at once. 2007-05-23 09:19:55 +00:00
Laurent Rineau f794e41ef5 Different handling of the case where soname are not implemented, on a
platform, in other to avoid a warning on Darwin or Cygwin.
2007-03-01 23:38:42 +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
Laurent Rineau 31f8376377 - Rework on src/CGAL/common.mk:
- new targets for libCGAL.a, libCGAL.so, libCGAL.so.*
   - fix rules when SOVERSION is empty (use GNU/make idioms)
- Additional vpath in src/CGALQt/makefile, so that one can build it directly
  from a checkout of the trunk.
- fix the build of libCGALBenchmark.
- fix the bison special stuff, so that we no longer rely on the expr and
  the $(shell) function of GNU/make.
2007-02-22 19:58:08 +00:00
Joachim Reichel 51d1ea3c91 * simplify build rules (possible, since GNU make is now required) 2007-02-22 17:53:45 +00:00
Laurent Rineau d6c27e8c4e Use "../CGAL/common.mk" for libCGAL as well, to avoid red testsuite if
somebody copy-paste the libCGAL makefile.
2007-02-20 23:58:32 +00:00
Laurent Rineau 317be1769b Important detail: we can know compile CGAL libraries without install_cgal.
CXXFLAGS can be overridden from command line.\
2007-02-16 21:14:58 +00:00
Laurent Rineau 36636d49b5 - Continue factorization between libraries' makefiles,
- install_cgal cleanup.
2007-02-16 21:00:37 +00:00
Efi Fogel 8941c46f57 An attempt to pacify sparc_SunOS-5.9 2007-02-14 18:09:57 +00:00
Laurent Rineau e46f8e0740 Fix install_name for shared libraries, on Darwin. I forgot to make it depend on the library 2007-02-13 21:38:09 +00:00
Efi Fogel 74a15a1089 tweaked bison handling 2007-02-13 11:08:52 +00:00
Efi Fogel a69fc882f1 fixed typo 2007-02-12 21:36:44 +00:00
Efi Fogel 3761874470 cleanup generic rules 2007-02-11 17:16:39 +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 6fa698ad67 Everybody was dreaming of this commit log:
- factorization of makefiles for libCGAL, libCGALimageIO, libCore, and
 libBenchmark.
 - SONAMEs for everybody.
2007-02-09 22:29:15 +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
Bernd Gärtner 1b10fae680 Gmpzf.cpp removed again 2006-09-14 11:00:04 +00:00
Bernd Gärtner 8c2b820db9 added handling of Gmpzf.cpp 2006-09-07 13:36:52 +00:00
Andreas Fabri 8f77181791 Polynomial ->NefPolynomial 2006-07-14 07:15:22 +00:00
Andreas Meyer 6620001236 fix for solaris make 2006-05-23 13:58:21 +00:00
Laurent Saboret 87d65f75e3 Fixed svn properties of ASCII files (as defined by Maintenance/svn_client/config) 2006-04-18 12:42:52 +00:00
Sylvain Pion d2740513aa Use .cpp file extension instead of .C for src/*/* files. 2006-04-14 09:19:29 +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
Sylvain Pion e1a632e7cf Move src/makefile* under SVN instead of being generated. 2006-04-09 22:07:10 +00:00