Commit Graph

123 Commits

Author SHA1 Message Date
Maxime Gimeno 040458d248 Update of all the CMakeList and .cmake files for Qt5
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
Laurent Rineau b6aeb7cc66 Store CGAL_DISABLE_GMP in CGALConfig.cmake...
... and use it in UseCGAL/CGAL_Macros, to avoid re-enabling GMP by
error.
2014-07-09 15:39:44 +02:00
Andreas Fabri 02bb200fe5 Add a CMake variable that allows to disable GMP/MPFR 2013-03-15 14:11:34 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Eric Berberich 1d59758d89 add an additional check for requested component and raise the "NOTICE" if lib is not build 2012-10-10 14:21:50 +00:00
Alexander Kobel 04f07ef7bf replace spurious *_LIBRARY_DIR occurences by *_LIBRARIES_DIR 2012-10-04 09:05:32 +00:00
Laurent Rineau 514c1efad1 Make RS, MPFI, LEDA, and NTL optional essential libraries 2012-08-01 16:58:19 +00:00
Laurent Rineau 98992ea06b Use include_directories(SYSTEM ...) in the macro use_lib 2012-08-01 12:23:53 +00:00
Eric Berberich 972f164184 correct handling of optional parameter for use_lib macro 2012-07-05 18:33:27 +00:00
Eric Berberich a488660748 rely on CMake list(FIND ...) instead of macro
Macro is nicer to use, but needs to be included and is less efficient.
To improve understanding: added comments
2012-06-29 23:13:43 +00:00
Eric Berberich d4cb1c2212 SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential 2012-06-29 15:24:30 +00:00
Eric Berberich 87ebf20f51 need a certain order 2012-06-29 09:39:40 +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 3336c68671 fix for optional parameter 2012-06-28 12:47:13 +00:00
Eric Berberich df72a1aa08 macro use_lib now has an optional second parameter for UseFile
this avoids a nasty hack with checking for a leading ### in a string and 
allows to use "use_lib( FOO )" in other places much easier
2012-06-28 12:20:52 +00:00
Laurent Rineau bccf95ba88 Add a comment for later in CGAL_Macros.cmake 2012-06-27 16:33:35 +00:00
Eric Berberich 3ae59a513c removed verbosity 2012-06-21 22:07:04 +00:00
Eric Berberich 00330ee225 GMP and MPFR are mandatory 2012-06-21 21:57:42 +00:00
Eric Berberich 6b78ca27d6 use lib instead of vlib to be consitent with WITH_Lib 2012-06-21 14:54:46 +00:00
Sébastien Loriot d67be721d4 write prefix exception into config file and use default one otherwise for find_package 2012-06-21 14:27:35 +00:00
Sébastien Loriot 3efc565b71 bug in prefix setting 2012-06-21 12:42:08 +00:00
Sébastien Loriot b5ac8afe11 add comment 2012-06-21 12:04:22 +00:00
Sébastien Loriot c2240ede0e fix for ignoring preconfig 2012-06-21 09:53:03 +00:00
Eric Berberich 4bdf466f9d Request by Sebastien Loriot: Ignore a preconfig lib 2012-06-21 07:58:51 +00:00
Eric Berberich 3fde316a6c added CGAL_ENABLE_PRECONFIG (the default value has to be determined) 2012-06-20 11:16:17 +00:00
Eric Berberich 94f7f0c3ab remove some verbosity 2012-06-11 22:06:08 +00:00
Eric Berberich 3599206bf2 improved verbosity 2012-06-11 21:44:17 +00:00
Eric Berberich 4009ef00ae nicer output 2012-06-11 21:30:45 +00:00
Eric Berberich 1c1d5a0f69 better name 2012-06-11 21:11:26 +00:00
Sébastien Loriot 41d3549414 typo LIRARIES->LIBRARIES 2012-05-25 11:10:54 +00:00
Eric Berberich 60efbec2d3 merge from next 2012-05-20 11:50:30 +00:00
Eric Berberich 590111df6d typo for lib 2012-01-31 14:32:43 +00:00
Eric Berberich 8fc6cec7b6 added missing lib 2012-01-31 13:22:02 +00:00
Eric Berberich dc2fb9242a make GMP+MPFR mandatory 2012-01-31 10:47:45 +00:00
Eric Berberich cb485d4008 write info to cache only it WITH_<library> = ON 2012-01-21 16:41:37 +00:00
Eric Berberich 303afc2973 check WITH_LIB in case CGAL is build, but not if CGAL is only used 2012-01-11 01:30:10 +00:00
Eric Berberich 0abb3588b7 added some guards for forbidden/stupid lib configurations 2012-01-11 00:05:00 +00:00
Eric Berberich 809b15bef1 cleanup 2012-01-10 18:28:39 +00:00
Eric Berberich 3135d995dd remark for a thrown warning 2012-01-10 12:30:53 +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 ec5b246a55 Improve the display of full compiler version: support MSVC 2011-10-26 09:41:51 +00:00
Laurent Rineau dbf3ace24b merge from next 2011-09-22 07:56:49 +00:00
Laurent Rineau 8779d9c684 Add comments of unused macros, for later cleanup 2011-07-21 14:28:57 +00:00
Eric Berberich 56c034b893 merge from next 2011-04-27 22:34:14 +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 754a8fd50b fixed error 2011-04-21 14:21:11 +00:00
Eric Berberich 72e82d7e9a fixed usages for Prefix 2011-04-20 15:24:59 +00:00
Eric Berberich 2489f2d396 deal with library variable prefixes 2011-04-20 14:09:01 +00:00
Eric Berberich 0b89dff151 removed code for special lib 2011-04-20 12:38:34 +00:00
Eric Berberich d6e292df02 fixed wrong spelling 2011-04-20 10:28:27 +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
Eric Berberich 4b4d40e07e fixed include order to detect right library 2011-04-09 14:19:27 +00:00
Laurent Rineau abfc4df4b3 If the compiler is llvm-clang, try to know what gcc version is used. 2011-03-08 14:05:19 +00:00
Laurent Rineau 9f9015e318 (Merge the branch /branches/candidate-packages/Installation)
Patch to trunk/Installation/ to display the full version message of the
compiler, if RUNNING_CGAL_AUTO_TEST is set (in the testsuite). That will
help to know which compiler are run by tests platforms.

Display also the result of `uname -a`
2010-11-03 18:16:16 +00:00
Laurent Rineau d81a462615 Quote file paths 2010-08-10 14:35:04 +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
Laurent Saboret c7f102ece4 Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake 2009-10-01 10:36:15 +00:00
Fernando Cacciola c5b9fb843f Allow blank in paths to sources 2008-12-14 23:38:01 +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 fb446def12 Moved CGALConfig.cmake-.*.in down lib/CGAL.3,4 2008-11-04 15:58:45 +00:00
Fernando Cacciola 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +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 484ae74ae3 Added BLAS/LAPACK and TAUCS support 2008-10-17 18:13:17 +00:00
Fernando Cacciola fff733b368 Fixed add_to_cached_list 2008-10-15 18:15:03 +00:00
Fernando Cacciola 026bf9eae5 Fixed cache_set macro to accept non-existent variables as lvalues 2008-10-15 18:10:45 +00:00
Fernando Cacciola bd5e784004 Dependencies setup refactored 2008-10-01 21:26:28 +00:00