Commit Graph

200 Commits

Author SHA1 Message Date
Laurent Rineau 24ec9f43fb merge changes from next 2012-01-25 11:23:02 +00:00
Laurent Rineau 7177fa5a63 Add a check that NDEBUG is not defined by test platforms 2012-01-25 11:14:17 +00:00
Sébastien Loriot d44761fce6 merge from next 2012-01-24 17:27:56 +00:00
Eric Berberich abd8cf62a6 fixed spacing 2012-01-24 12:25:12 +00:00
Laurent Rineau baeec2d53f merge all the changes from next! 2012-01-20 17:45:27 +00:00
Sébastien Loriot d5bf9ee997 merge from next 2012-01-20 10:30:58 +00:00
Laurent Rineau 2dd281500a Followup to that commit:
| ------------------------------------------------------------------------
  | r65982 | lrineau | 2011-10-20 17:49:05 +0200 (Thu, 20 Oct 2011) | 8 lines
  | Changed paths:
  |    M /branches/next/Scripts/scripts/cgal_create_cmake_script
  | 
  | Improvement of cgal_create_cmake_script
  | 
  | This allows to create a CMakeLists.txt in a directory whereas the sources
  | are in another directory.
  | 
  | This will allow out-of-sources creation of CMakeLists.txt files. And, in
  | the end, that will improve the branch-build.
  | 
  | ------------------------------------------------------------------------

Make create_single_source_cgal_program() compatible with absolute paths
2012-01-18 13:58:12 +00:00
Sébastien Loriot 3e4ea6c3b1 merge from next 2012-01-13 13:19:58 +00:00
Sébastien Loriot 6e1df30eff merge from next 2011-12-26 13:15:30 +00:00
Sébastien Loriot 9b75cd5506 require Eigen 3.1 or greater 2011-12-22 16:06:37 +00:00
Laurent Rineau 06c96d91ce Do not include CGAL include dirs *before* user ones!! 2011-12-07 10:49:43 +00:00
Sébastien Loriot bdcf26bb20 merge next 2011-12-01 09:19:02 +00:00
Laurent Rineau 93d8367048 merge from next
This branch still has to be tested.
2011-10-26 14:40:48 +00:00
Laurent Rineau b978f9bb85 merge from next 2011-10-26 13:02:45 +00:00
Laurent Rineau 5a7b6ace88 Bug fix: if CGAL_Boost_USE_STATIC_LIBS evaluates to FALSE, one wants to use
its value anyway.
2011-10-26 11:24:17 +00:00
Laurent Rineau ec5b246a55 Improve the display of full compiler version: support MSVC 2011-10-26 09:41:51 +00:00
Laurent Rineau fcc0874c59 Do NOT include CGAL_INCLUDE_DIRS before!
We want, for example, to have CMAKE_BINARY_DIR/include before those dirs.
2011-10-21 14:44:53 +00:00
Laurent Rineau badcdb5871 Completely remove the support for auto-linking of GMP and MPFR
I have grepped for auto_link/(GMP|MFR)|AUTO_?LINK_(GMP|MPFR) and I removed
completely any support for auto-linking of GMP and MPFR from CGAL.

That is no longer necessary, nor relevant, no that we provide precompiled
GMP and MPFR libraries under standard names libgmp-10.lib and
libmpfr-4.lib.

To test in candidates: 
   Core
   Installation
   Number_types
2011-10-14 13:39:45 +00:00
Laurent Rineau 5da9888303 Typo in text: s/option/variable/ 2011-10-13 15:38:13 +00:00
Laurent Rineau e3eef962d7 Do not add -DBOOST_DYN_LINK with auto-link if not enabled.
In particular, do not add that macro definition on Linux/MacOS.
2011-10-13 15:34:44 +00:00
Laurent Rineau 2e05123891 merge from next 2011-10-13 10:19:46 +00:00
Laurent Rineau c1fff72997 Revert that commit, which was wrong (see below):
| ------------------------------------------------------------------------
  | r65557 | lrineau | 2011-09-26 16:49:02 +0200 (Mon, 26 Sep 2011) | 9 lines
  | Changed paths:
  |    M /branches/next/Installation/cmake/modules/CGAL_UseBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/CGAL_UseLAPACK.cmake
  |    M /branches/next/Installation/cmake/modules/FindBLAS.cmake
  |    M /branches/next/Installation/cmake/modules/FindLAPACK.cmake
  |    M /branches/next/Installation/doc_tex/Installation/installation.tex
  | 
  | BLAS and LAPACK do not have header files.
  | 
  | One implementation of BLAS or LAPACK can have a header file, but that is
  | not mandatory for an implementation, and (hopefully) nothing in CGAL tries
  | to include a blas.h or a lapack.h.
  | 
  | The current revision removes mentions of BLAS_INCLUDE_DIR and
  | LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
  | 
  |
  ------------------------------------------------------------------------

Reason:

  For the implementation cblas/clapack, our use of that implementation does
  need a header <blaswrap.h> to work.
2011-10-13 10:17:16 +00:00
Laurent Rineau d57c543d60 Bug fix again. Use cache_set with two arguments. 2011-10-12 15:03:08 +00:00
Laurent Rineau 7225ec7d1c Fix bug in a previous commit
A variable must be in cache before is can be use with add_to_cached_list.
2011-10-12 14:39:57 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Laurent Rineau 6985effcc8 Fix the CMake module CGAL_SetupBoost shipped with CGAL
CGAL_Boost_USE_STATIC_LIBS is now an (advanced) CMake option on all
platforms, and is stored in the generated CGALConfig.cmake. That way, its
value is proposed as the default value for the same option when programs
using CGAL are configured using CMake.

The script UseCGAL includes the module CGAL_TweakFindBoost, to define
Boost_USE_STATIC_LIBS and Boost_ADDITIONAL_VERSIONS.
2011-10-12 13:47:18 +00:00
Laurent Rineau 7059bf007a fix typo in text 2011-10-11 16:08:24 +00:00
Laurent Rineau 2ceafafab9 Cleanup in the CMake variable CGAL*SHARED_LIB*
Previously there was a variable CGAL_SHARED_LIBS defined by
CGALConfig.cmake. This one is now unified with CGAL_BUILD_SHARED_LIBS.

And the option CGAL_BUILD_SHARED_LIBS is only defined as an option if one
are building CGAL libraries. If CGAL_Common.cmake is included from another
project, such as from UseCGAL.cmake, then this variable is set in
CGALConfig.cmake as a regular (non-cached) CMake variable.
2011-10-11 14:24:22 +00:00
Laurent Rineau 87148361ff Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
Better name, and more coherent with CMake variable name:
  BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Laurent Rineau aa00f78883 Also support the compilation of CGAL libraries as static libs, with MSVC. 2011-10-06 16:01:16 +00:00
Laurent Rineau 8056b1ed39 In CMake, Windows users will have the choice to choose to use static or
dynamic Boost libraries
2011-10-06 13:15:11 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Sébastien Loriot 76b4363cd3 correctly parse IPE_VERSONLIB to detect minor versions of ipe 2011-09-29 07:57:17 +00:00
Laurent Rineau 9a21d66104 BLAS and LAPACK do not have header files.
One implementation of BLAS or LAPACK can have a header file, but that is
not mandatory for an implementation, and (hopefully) nothing in CGAL tries
to include a blas.h or a lapack.h.

The current revision removes mentions of BLAS_INCLUDE_DIR and
LAPACK_INCLUDE_DIR in CGAL cmake scripts about BLAS and LAPACK.
2011-09-26 14:49:02 +00:00
Sébastien Loriot 62ed832e2b *Add a model for SVDTraits using Eigen and use it by default. Update the doc.
*Add non-sparse matrix class (thus renamimg of the existing one)
*specialisation of the matrix class in Eigen_solver_traits according
 whether this is a symmetric or asymmetric matrix
*update use-files of lapack and Taucs to get definitions
2011-09-21 12:36:13 +00:00
Sébastien Loriot a33f35551a *modify FindEigen3 to specify a use-file and to cache the include directory
*add a eigen3 use-file
2011-09-20 14:17:05 +00:00
Sébastien Loriot 350e386a8f add a copy of the cmake module FindEigen3 taken from eigen repo 2011-09-20 14:00:38 +00:00
Laurent Rineau 8779d9c684 Add comments of unused macros, for later cleanup 2011-07-21 14:28:57 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Laurent Rineau 768159d119 Remove a CMake warning about RUNNING_CGAL_AUTO_TEST that is not always
used.
2011-05-31 09:38:31 +00:00
Laurent Rineau 6c0a2019ba MS: auto-link for psapi.lib, instead of having an explicit link command. 2011-05-30 11:28:15 +00:00
Laurent Rineau 3b92a39100 Fix a bug in the branch build: put CGAL_INSTALLATION_PACKAGE_DIR in CGALConfig.cmake
If CGAL_INSTALLATION_PACKAGE_DIR is not set in CGALConfig.cmake, then when
one compile a demo/example on Windows, Installation/auxiliary (where
precompiled version of some third party libraries should be put) cannot be
found and used. That replaces the old CMake variable CGAL_SOURCE_DIRECTORY
(before branch-build).
2011-05-24 14:06:13 +00:00
Eric Berberich a54f16d874 fixed include order 2011-04-29 12:36:03 +00:00
Laurent Rineau 12744ab7ff Track dependencies between libraries and examples/demos
With this patch, when CGAL as been configured with WITH_examples and/or
WITH_demos, then the executables of examples and demos depends on the CGAL
libraries. That means if one change a file involved in a CGAL library, and
ask the rebuild of an executable, then the CGAL library will be rebuilt
first.
2011-04-28 13:11:09 +00:00
Laurent Rineau 4b795c56f4 Global handling of CMake policies
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.
2011-04-28 10:33:17 +00:00
Laurent Rineau d827ed8d74 Add quotes in execute_process if the command name is a variable. 2011-04-27 21:16:42 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Eric Berberich 4b4d40e07e fixed include order to detect right library 2011-04-09 14:19:27 +00:00
Luis Peñaranda a5582e7d96 updated RS-use script, to allow old versions of RS to be used 2011-04-07 15:52:39 +00:00