Commit Graph

56 Commits

Author SHA1 Message Date
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
Laurent Rineau 151844059a Fix a typo (found by Mael) 2013-10-29 16:19:15 +01:00
Laurent Rineau 85eeaca873 Link with the CGAL *target* we possible (instead of linking with the library)
That is a late follow-up to the following commit:

  | commit 12744ab7ff
  | Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
  | Date:   Thu Apr 28 13:11:09 2011 +0000
  |
  |     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.
  |
  | Notes:
  |     r63187 branches/next

Or maybe the bug was re-introduced by recent modifications of our CMake
scripts.
2013-08-20 15:45:29 +02:00
Eric Berberich 6eafd776c7 readded link_libraries 2012-12-27 20:01:56 +01:00
Eric Berberich 03ac16f071 whitespace for git 2012-10-23 23:27:34 +00:00
Eric Berberich fe43dd0171 better handling if source of executable is not in a git repo 2012-10-22 23:38:25 +00:00
Eric Berberich fc6d74c399 raise a CMake AUTHOR_WARNING if current branch does not match branch used to install cgal 2012-10-22 23:10:57 +00:00
Eric Berberich 357d6258f5 cmake's link_libraries is deprecated
removed almost all occurenced (missing UseFiles). While
doing so, some CMakeLists.txt could also be simplified. In fact
many more CMakeLists.txt can be simplified, in one of two ways:
1) add external libs to CGAL_3RD_PARTY_LIBRARIES and
2) call cgal_create_single_source_program
2012-08-03 22:32:39 +00:00
Laurent Rineau 8e167590c8 Use include_directories(SYSTEM ...) for 3rd-party libraries
gcc has an option -isystem, that can replace -I. The documentation is:

 -isystem dir

     Search dir for header files, after all directories specified by -I but
     before the standard system directories. Mark it as a system directory,
     so that it gets the same special treatment as is applied to the
     standard system directories. If dir begins with "=", then the "=" will
     be replaced by the sysroot prefix; see --sysroot and -isysroot.


The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.

In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).

This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
2012-08-01 10:53:37 +00:00
Eric Berberich 3a7ad3baaa mandatory -> essential 2012-06-29 15:27:45 +00:00
Eric Berberich b5a4e941fd the mandatory libs need an particular order, and we simplify with a macro 2012-06-29 09:24:19 +00:00
Eric Berberich eb6c435c4a correct spelling of GMPXX_FOUND variable
FOUND_GMPXX -> GMPXX_FOUND
2012-06-28 13:02:32 +00:00
Eric Berberich dc2fb9242a make GMP+MPFR mandatory 2012-01-31 10:47:45 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Eric Berberich dfd8e8ed64 distinguish internal libs and external libs as COMPONENTS 2012-01-11 01:32:56 +00:00
Eric Berberich 0def3cb179 improved formatting 2012-01-10 10:17:43 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 06c96d91ce Do not include CGAL include dirs *before* user ones!! 2011-12-07 10:49:43 +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 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 dbf3ace24b merge from next 2011-09-22 07:56:49 +00:00
Eric Berberich a54f16d874 fixed include order 2011-04-29 12:36:03 +00:00
Eric Berberich bcdc7c3771 merge from next 2011-04-28 21:35:58 +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
Eric Berberich 2bced23597 moved ${CGAL_LIB}_FOUND to config file 2011-04-24 08:15:42 +00:00
Eric Berberich abec32922e added fix 2011-04-22 15:23:33 +00:00
Eric Berberich 15b31230a7 added option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT 2011-04-21 14:25:13 +00:00
Eric Berberich 72e82d7e9a fixed usages for Prefix 2011-04-20 15:24:59 +00:00
Eric Berberich fba0d339e7 cleanup 2011-04-20 10:17:01 +00:00
Eric Berberich 348e74b2ad simplified external lib handling (not yet complete)
- clean up CGALConfig files (gmp/mpfr version)

- special role of LEDA

- gmp/mpfr need version

- removed SetupGMP ;-)

- clean up Dependencies

- NTL without USE_FILE

- added mandatory libs
2011-04-19 22:45:54 +00:00
Eric Berberich 367a387931 fixed tod 2011-04-18 08:54:00 +00:00
Eric Berberich 28cd8fc2a6 added list of supporting 3rd party libs 2011-04-18 08:46:51 +00:00
Eric Berberich 863f0c4de5 enable preconfiguration for external libs (for now only NTL, RS, MPFI), others to come 2011-04-17 19:55:06 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Laurent Rineau e458164d0a Merge the work from CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r57847 | lrineau | 2010-08-06 14:11:31 +0200 (Fri, 06 Aug 2010) | 4 lines
  | 
  | Turn cgal_setup_module_path into a CMake function.
  | Fix the CMake errors with CMake-2.6.0 and CMake-2.6.1 (VERSION_LESS if IF
  | has been introduced in CMake-2.6.2).
  | ------------------------------------------------------------------------
  | r57816 | lrineau | 2010-08-05 15:56:57 +0200 (Thu, 05 Aug 2010) | 17 lines
  | 
  | Clean the CMake configuration:
  | 
  |   - CGALConfig_install.cmake.source.in is removed. The variable
  |     SOURCE_INSTALL/CGAL_SOURCE_INSTALL were unused, and probably not tested
  |     for a long time (I found errors in
  |     CGALConfig_install.cmake.source.in). This has been cleaned.
  | 
  |   - CGALConfig_install.cmake.fhs.in is renamed (no .fhs. in it).
  | 
  |   - The module path is now modified in a macro (defined in
  |     CGAL_Macros.cmake), and the variable CGAL_CMAKE_MODULE_PATH is no
  |     longer stored or used in CGALConfig.cmake (the reason is that is was
  |     used as a path, where it is actually a list of paths).
  | 
  |   - The UseCGAL.cmake file only link with CGAL libraries that has been
  |     configured.
  | 
  | ------------------------------------------------------------------------
2010-08-10 11:55:00 +00:00
Fernando Cacciola 84a42139c0 Added back the fix for missing flags on demos, examples and tests 2009-04-27 14:32:55 +00:00
Fernando Cacciola 6fcfa43cd7 Fixed find_package bug in 2.6.3 2009-04-06 13:34:12 +00:00
Fernando Cacciola dd4aadc373 Fixed loosing flags when configuring demos and examples at once 2009-03-10 18:16:10 +00:00
Fernando Cacciola 6f52d14e4d Added current binary directory to each demo/examples to find .moc files 2008-12-17 19:44:21 +00:00
Laurent Rineau 2d8f66d8be That should fix the problem with strange characters, such as "(", in the
sources directory.
2008-12-17 15:28:54 +00:00
Laurent Rineau 642bde884e Last minute big change: make GMP/MPFR an optional dependency.
Locally tested.

Just after that commit, I will create a fake release and trigger a
test suite with that modification.
2008-12-03 13:09:43 +00:00
Fernando Cacciola 4a4d927522 Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
Fernando Cacciola 2d5b17b9f4 renamed cmake/modules to lib/CGAL-3.4 (0/1) 2008-11-04 16:00:57 +00:00
Fernando Cacciola 145ee41079 Prefixed CGAL cmake modules with CGAL_ 2008-11-04 12:49:32 +00:00
Fernando Cacciola 2455ef9e85 Replaced CGAL_SOURCE_DIR and CGAL_BINARY_DIR with CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR 2008-10-30 13:45:04 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Fernando Cacciola aae7e6e95e Avoid re-configuring 3rd party libs on user programs since the reference cache is not loaded in this case 2008-10-07 23:10:03 +00:00
Fernando Cacciola 8c47be0a13 Fixed droped CGAL_USE_<dependency> 2008-10-01 22:18:40 +00:00
Fernando Cacciola 2092077d93 Dependencies setup refactored II 2008-10-01 21:27:19 +00:00
Laurent Rineau a5efb9f1ba Fix indentation. 2008-09-16 13:34:43 +00:00