songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
53,053 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

361 Commits

Author SHA1 Message Date
Sébastien Loriot ff0ae4ac7b merge from next 2012-08-03 13:34:14 +00:00
Eric Berberich 2f6dae6bbb now I got it: it's not just the first argument, it's the first file 
"first" is a little bit general name for a parameter, changed
to firstfile and added a comment about handling other files
 2012-08-03 12:57:04 +00:00
Eric Berberich 293a072b43 make signatures consistent 2012-08-03 12:46:58 +00:00
Eric Berberich 05c4d0a28f be consistent in variable name 2012-08-03 12:23:40 +00:00
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Laurent Rineau 6e579584b3 Fix FindRS(3) modules 
A FindFoobar module must not include a UseFoobar file. CGAL_UseRS3 now
includes CGAL_UseMPFI, and not FindRS and FindRS3.

+ Fix also a typo in a message of FindRS3.
 2012-08-02 10:32:04 +00:00
Laurent Rineau 414182edbf Change the order of messages, to be coherent with CGAL_UseRS(3) 2012-08-02 10:02:34 +00:00
Laurent Rineau cf1ad35e79 Better formatting of the documentation of GMP CMake modules 2012-08-02 09:50:24 +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
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
Laurent Rineau 767899fa33 Revert some modifications made by error. 2012-07-31 16:41:10 +00:00
Sébastien Loriot 5b59f2ad8d merge from next 2012-07-30 10:25:24 +00:00
Laurent Rineau 20762313af Refresh the FindQt3-patched module, from CGAL, with recent changes 
to the FindQt3 module shipped with CMake

CGAL FindQt3-patched module uses the prefix QT3_ for all cache variables,
instead of just QT_. That allows to use Qt3 and Qt4 in the same project
(but for different binaries of course).
 2012-07-26 09:28:21 +00:00
Sébastien Loriot 40f237b70d merge from next 2012-07-26 07:24:02 +00:00
Ophir Setter 628087b87a moc-qt3 to come before moc. Now, if moc is qt4 moc the cmake file will use the correct moc in Qt3 2012-07-26 07:08:26 +00:00
Philipp Möller f330095286 Add Boost.System to the CGAL dependencies 
As of Boost 1.50 it is required to link Boost.System with CGAL. System
has been a Thread dependency all along and we simply never linked to
it and apparently got lucky.

Add it to the dependencies, add it in the manual and INSTALL file.
 2012-07-24 10:02:57 +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 1d21969b14 revert use of macro and rely on list(FIND ...) 2012-06-29 22:53:42 +00:00
Eric Berberich 167783acde copy'n'paste works if the right includes exist: here missing CGAL_Macros 
instead of including the file I've just added the general cmake makro to 
check whether an item is in the list. Why does it need a macro? There should 
be a list-operation for that ...
 2012-06-29 22:22:25 +00:00
Eric Berberich 3a7ad3baaa mandatory -> essential 2012-06-29 15:27:45 +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 d0d6335a79 added Eigen3_FIND_VERSION to search for minimal version 
CGAL_Common.cmake is included at a very early stage 
- when configuring CGAL but also
- when configuring demos etc
 2012-06-29 12:51:02 +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
Laurent Rineau 160975eb12 Leftover of previous commit: 
Second fix for Windows

On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.

What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
 2012-06-28 15:57:29 +00:00
Laurent Rineau 483593826b Second fix for Windows 
On Windows, with auto-linking, the variables ${CGAL_LIB}_LIBRARY are
empty.

What is more, that is a bad idea to check if the libraries does exist. If
for example CGAL has been configured with WITH_CGAL_Qt4, and the CGAL_Qt4
library is not correctly created, we want a compilation error, and not just
a CMake warning saying "Please configure CGAL using WITH_${CGAL_LIB}=ON."
 2012-06-28 15:47:16 +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 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
Eric Berberich ee0fde5d13 re-added files probably used by external users 2012-06-28 12:03:12 +00:00
Laurent Rineau bccf95ba88 Add a comment for later in CGAL_Macros.cmake 2012-06-27 16:33:35 +00:00
Eric Berberich d4a6f27503 replace calls to UseESTBL 2012-06-26 23:52:07 +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
Sébastien Loriot 5dd3045330 move installation dir setup in demo script 2012-06-21 09:51:55 +00:00
Eric Berberich 4bdf466f9d Request by Sebastien Loriot: Ignore a preconfig lib 2012-06-21 07:58:51 +00:00
Sébastien Loriot e7e15113ef modification for IPE 
->move the version check and the installation directory detection into the 
  demo CMakeLists.txt
 2012-06-20 15:12:28 +00:00
Eric Berberich 3fde316a6c added CGAL_ENABLE_PRECONFIG (the default value has to be determined) 2012-06-20 11:16:17 +00:00
Sébastien Loriot 7b5902c9f6 default IPE_VERSION to AUTODETECT 2012-06-19 09:36:04 +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
Eric Berberich 10d8114ed3 fix for Eigen 2012-05-28 08:05:24 +00:00
Sébastien Loriot 41d3549414 typo LIRARIES->LIBRARIES 2012-05-25 11:10:54 +00:00
Eric Berberich 2231271896 CGAL macro is not used anymore 2012-05-24 07:10:42 +00:00
Eric Berberich 60efbec2d3 merge from next 2012-05-20 11:50:30 +00:00
Sébastien Loriot 6bbf287503 env variable override the default superlu 2012-04-30 07:10:10 +00:00
Sébastien Loriot 2d456057f6 accomodate changes due to merging from next 2012-03-26 15:22:16 +00:00
Sébastien Loriot 75e23bd978 merge from next 2012-03-26 13:41:01 +00:00
Sébastien Loriot a2a3192695 remove duplicated file 2012-03-26 13:34:36 +00:00
Sébastien Loriot 15f43b4ecc test that the cached include path is valid 2012-03-26 09:43:07 +00:00
Laurent Rineau a429b26316 Cherry-pick that revision from /branches/features/Mesh_3-parallel-cjamin/ 
| ------------------------------------------------------------------------
  | r68020 | cjamin | 2012-03-12 18:27:30 +0100 (Mon, 12 Mar 2012) | 1 line
  | 
  | To be able to build CGAL on MSVC11
  |
  ------------------------------------------------------------------------

It adapts CGAL CMake scripts and CGAL auto-link headers to MSVC2011.

Thanks to Clement Jamin, from Inria, for the patch.
 2012-03-19 14:26:17 +00:00
Eric Berberich 9a0e579445 use hints 2012-02-13 14:26:33 +00:00
Sébastien Loriot 8c8c8af3ae first look into path indicated by EIGEN3_INC_DIR 
before system PATH (override the system version of
Eigen)
 2012-02-10 16:09:21 +00:00
Laurent Rineau df25f0aa17 Fix (examples|demo)/CMakeLists.txt 
That way, those CMakeLists.txt can be used to build examples and demo from
outside the building of CGAL libraries.
 2012-02-06 11:39:40 +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
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
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
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Eric Berberich ee6c8d4775 need GMP version 2012-01-21 16:41:47 +00:00
Eric Berberich cb485d4008 write info to cache only it WITH_<library> = ON 2012-01-21 16:41:37 +00:00
Eric Berberich f2eef3c11b need gmp version 2012-01-21 16:41: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
Eric Berberich 76cfe2ae9b let NTL work without preconfig 2012-01-19 15:25:53 +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
Eric Berberich 406810fe52 need to set flag in compiler_config.h 2012-01-11 16:11:02 +00:00
Eric Berberich dfd8e8ed64 distinguish internal libs and external libs as COMPONENTS 2012-01-11 01:32:56 +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 3c291f7103 removed output 2012-01-10 18:12:37 +00:00
Eric Berberich d83bb49f22 cosmetics 2012-01-10 14:36:33 +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 7945fb8ea5 improved formatting 2012-01-10 10:17:09 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +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