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

329 Commits

Author SHA1 Message Date
Laurent Rineau 291b3029bb Fix a bug in CGAL_SCM.cmake when the HEAD is not a branch 
If the current working directory is a checkout of a commit that is not a
branch, for example, a commit in the ancestors of a branch, then CGAL CMake
scripts gave that CMake error:

  == CMake setup ==
  fatal: ref HEAD is not a symbolic ref
  CMake Error at Installation/cmake/modules/CGAL_SCM.cmake:36 (string):
    string sub-command REGEX, mode REPLACE needs at least 6 arguments total to
    command.
  Call Stack (most recent call first):
    CMakeLists.txt:17 (include)

  == CMake setup (DONE) ==

This patch fixes the error. If HEAD is not a branch, then CGAL_GIT_BRANCH
is equal to "HEAD".
 2013-01-21 17:23:36 +01:00
Laurent Rineau 3b1ba8ba70 Merge remote-tracking branch 'origin/Installation-link_libraries_deprecated-eric' 2013-01-14 14:50:59 +01:00
Eric Berberich 03c6c56549 not necessarily a CGAL_-UseFile 2012-12-28 18:55:50 +01:00
Eric Berberich 6eafd776c7 readded link_libraries 2012-12-27 20:01:56 +01:00
Laurent Rineau aa3d26e96c Merge branch 'Installation-CreateSingleSourceCGALProgram_warning-lrineau' 2012-12-05 11:42:09 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Laurent Rineau e33d05f919 Add a AUTHOR_WARNING if the source file does not exist. 2012-11-30 10:34:29 +01:00
Philipp Möller 3d253a0edd Add CGAL_GIT_HASH and provide defaults for all variables 2012-11-15 13:20:37 +01:00
Eric Berberich ddd4ca95da fix if git dir is already given dir 2012-11-13 16:20:07 +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 358b8bb92b search for git parent dir + commented some verbosity 2012-10-22 23:09:58 +00:00
Eric Berberich 25f3fb6e2e remove SVN, refactored SCM code to CGAL_SCM.cmake 
(plan is to reuse it UseCGAL.cmake)
 2012-10-22 22:39:36 +00: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
Eric Berberich 7503d0ce5b merge from next 2012-10-08 09:57:49 +00:00
Eric Berberich 4cae227f10 NTL_VERSION can also be just \d.\d (regex was \d.\d.\d) 2012-10-05 22:34:46 +00:00
Eric Berberich 2bbc6c94a9 added missing { 2012-10-05 22:14:02 +00:00
Alexander Kobel e062c5f9e5 fixed PATH_SUFFIXES inconsistencies: 
- proper indentation
- merge double occurences
- standardize location at the end block, before DOC

tested with GMP(XX), MPFR, MPFI, LEDA, RS(3), NTL and a (small) number of ways to specify library
locations via environment and CMake variables, on Debian 64bit
 2012-10-05 12:40:10 +00:00
Alexander Kobel 461a23478d move detection whether additional LEDA flags are necessary to FindLEDA stage 
only apply includes if UseLEDA is called
 2012-10-04 13:28:51 +00:00
Alexander Kobel d3d82afd4a automatically add -ffriend-injection, -fno-strict-aliasing, -lX11 as required for LEDA 2012-10-04 12:07:42 +00:00
Alexander Kobel c06f84d4db fixed fallback to RS_dirs for RS3 2012-10-04 12:06:46 +00:00
Eric Berberich c81470929e fixed variable 2012-10-04 09:56:48 +00:00
Alexander Kobel 160e937500 try $ENV{<PKG>_DIR}/[include,lib] as a fallback for $ENV{<PKG>_[INC,LIB]_DIR} 2012-10-04 09:34:54 +00:00
Alexander Kobel 04f07ef7bf replace spurious *_LIBRARY_DIR occurences by *_LIBRARIES_DIR 2012-10-04 09:05:32 +00:00
Alexander Kobel bb5f4dc8e1 added evaluation of LEDA_LINKER_FLAGS 2012-10-04 09:00:46 +00:00
Eric Berberich b1481c43c8 ${lib} is now prefixed with name, which needed adaptions in loop 
In addition: removed fake variable and thus simplified loop 
(needed to rename CGAL_INSTALLED_${lib}_LIBRARY to ${lib}_LIBRARY_INSTALLED)
 2012-09-12 14:26:02 +00:00
Eric Berberich 80616feea6 added missing $ to copy content of variable 2012-08-20 08:10:20 +00:00
Laurent Rineau 640c7355ec Fix: was no longer working in out-of-source build! 2012-08-06 13:21:07 +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
Eric Berberich 5f524b0802 subdirectories in src finally get correct name 2012-08-03 17:21:30 +00:00
Laurent Rineau b22a86c1c1 Fix the CGALConfig.cmake that is installed, on Windows 2012-08-03 15:38:26 +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
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
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