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

183 Commits

Author SHA1 Message Date
Laurent Rineau da2726e0e7 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Intersections_2/test/Intersections_2/test_intersections_2.cpp
#	Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
#	Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
 2019-07-26 18:33:55 +02:00
Laurent Rineau 4d5b4c950a Merge pull request #4085 from maxGimeno/Update_Find_TBB-GF 
Update FindTBB.cmake
 2019-07-26 18:27:00 +02:00
Laurent Rineau 5d47146cd6 Fix in header-only 2019-07-25 16:14:50 +02:00
Laurent Rineau a17c0d628d Fix our usage of TBB and <thread.h> 
A lot of parts of CGAL use `<thread>` in conjunction with TBB. I have
added the `find_package(Threads)` in `CGAL_target_use_TBB.cmake` for
convenience.

I have also restored FindTBB.cmake as a pure copy of
  https://github.com/Kitware/VTK/blob/master/CMake/FindTBB.cmake
with that version:

> c7249fed2e73ce25fbbc53363d9caf4ab5cc9195
> Author: Cory Quammen <cory.quammen@kitware.com>
> Date:   Thu Feb 14 23:21:09 2019 -0500
>
>     FindTBB: handle basic linker scripts
>
>     TBB binaries may define libtbb.so as a linker script of the form
>
>     INPUT(libtbb.so.2)
>
>     Make FindTBB find the real .so file libtbb.so points to in such cases.
>
>     Approach borrowed from vtk-m/CMake/VTKmDeviceAdapters.cmake on
>     suggestion from Robert Maynard.
>
>
 2019-07-24 10:35:36 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau c2e8365303 Actually, it can only work with CMake>=3.11 2019-05-10 17:47:58 +02:00
Laurent Rineau a0bfaee9eb Consider CGAL as an imported target 2019-05-10 17:31:17 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF 
Adapt to Boost 1.70
 2019-05-07 15:48:03 +02:00
Laurent Rineau 43cc6b2b2d CGAL_TweakFindBoost must be included before any call to FindBoost 2019-05-06 16:40:50 +02:00
Laurent Rineau 4782ea1665 Fix the *installed* header-only CGALConfig.cmake 
The previous installed version of `CGALConfig.cmake`, when
`CGAL_HEADER_ONLY` is true, was hard-coding a path `../../../`,
relative to the location of itself. It might be that the CMake modules
are not installed in a sub-directory with three components, relatively
to the prefix.

That way of doing it buggy. And that triggered issue with the cgal
port in vcpkg:

  https://github.com/Microsoft/vcpkg/pull/5734

This patch is just another hack: it hardcodes that the relative path
can be any of:

  - `../`,
  - `../../`, or
  - `../../../`.
 2019-03-19 16:49:31 +01:00
Laurent Rineau 47cdc92064 Merge pull request #3463 from lrineau/CGAL-Fix_CTest-GF 
Fix CTest after #3413
 2018-12-19 16:12:29 +01:00
Laurent Rineau f6e83cd23e Move the definition of CGAL_USE_FILE in case of early return() 2018-12-13 10:59:00 +01:00
Laurent Rineau c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF 2018-12-10 16:52:33 +01:00
Laurent Rineau 81cf49efb1 Fix the construction of CGAL_ROOT in header-only 
In header-only, `CGALConfig.cmake` constructs the path to the root of
the CGAL installation. It used to use `../` a lot, to go back in
parent directories, but:
  - that was... ugly,
  - and Ninja saw a problem with that (a warning about the path to
  `print_GMP_version.cpp`).

`CGALConfig.cmake` Now uses the CMake command `get_filename_component`.
 2018-11-28 09:46:53 +01:00
Laurent Rineau c28c0a4b2d Fix a bug with CTest in non-header-only 
The pull-request https://github.com/CGAL/cgal/pull/3413 has introduced
a side-effect: CTest was broken when `CGAL_HEADER_ONLY=OFF`, for all
tests using a `.cin` or `.cmd` file. That is due to the variable
`CGAL_CURRENT_SOURCE_DIR` that was only filled by `UseCGAL.cmake`.

Now that we forbid CGAL directories without `CMakeLists.txt`, that
variable `CGAL_CURRENT_SOURCE_DIR` is now useless, and can be removed:
`CMAKE_CURRENT_SOURCE_DIR` is sufficient. That fixes the bug with
CTest, and also makes the CMake code a bit simpler.
 2018-11-19 14:33:54 +01:00
Guillaume Damiand ee4f7c5cd9 Resolve conflict 2018-11-02 19:13:25 +01:00
Guillaume Damiand 9e3f264e2c Add an include CGAL_Common.cmake 2018-10-23 13:44:00 +02:00
Guillaume Damiand 7e022bacf6 Add a debug message, trying to understand where the problem comes from... 2018-10-23 09:09:45 +02:00
Guillaume Damiand d1a027bd2c Github lost my last push git status 2018-10-22 10:39:31 +02:00
Guillaume Damiand 152f34fd56 Change order of things, to be able to do include(CGAL_CreateSingleSourceCGALProgram.cmake) in all cases. 2018-10-22 10:31:06 +02:00
Guillaume Damiand 8f61243a13 Move one include after the definition of CGAL_MODULES_DIR 2018-10-19 10:18:37 +02:00
Laurent Rineau 980d254517 Re-add a missing line 2018-10-19 09:31:32 +02:00
Laurent Rineau 0dd59c1cfd Include CGAL_CreateSingleSourceCGALProgram.cmake in case of early return 2018-10-18 16:25:32 +02:00
Laurent Rineau 0e55a45155 Prefix our CMake function name with "cgal" 2018-04-13 15:02:22 +02:00
Laurent Rineau 17032feff4 Set the CGAL version variables in header-only 
Fixes #2820.
 2018-04-13 14:58:56 +02:00
Laurent Rineau 66b4ec4214 Add a warning about the use of Debug or "" in CMAKE_BUILD_TYPE 2018-03-20 17:08:52 +01:00
Laurent Rineau de1753566b Speed improvement with CGAL_HEADER_ONLY and WITH_{tests|examples}.. 
When `CGAL_HEADER_ONLY` and `WITH_{examples|tests|demos}`, then only
the first call to `find_package(CGAL)` does the job. The subsequent
calls return very fast, by caching the results in global properties.
 2018-03-14 23:04:09 +01:00
Laurent Rineau c781841f6b Fix header-only with the tarball layout 2017-12-08 10:35:36 +01:00
Laurent Rineau 06266211e6 Fix the pure-header-only CGALConfig.cmake, when installed 2017-12-06 12:53:46 +01:00
Andreas Fabri ea95e2b2eb CGALConfig.cmake changes the CMAKE_MODULE_PATH 
Maybe a temnporary "solution".

Laurent Rineau
 2017-11-30 10:07:53 +00:00
Laurent Rineau a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Laurent Rineau 4e78c4e10d header-only: do not define unwanted CGAL components 2017-11-22 13:02:04 +01:00
Laurent Rineau fe24a4db68 Explicit the dependencies of QGLViewer 2017-11-14 14:08:55 +01:00
Clement Jamin c89d551105 Add message saying that the header-only mode is activated 2017-03-27 18:13:20 +02:00
Laurent Rineau a27beba41c Check if the targets already exist 
`CGALConfig.cmake` is guarded, but it might be that the targets are
already defined by a sub-directory.
 2017-03-27 18:04:55 +02:00
Laurent Rineau 20dbf716ba Fill CGAL_USE_FILE for compatibility 2017-03-27 18:04:54 +02:00
Laurent Rineau 83482f5505 Fix CGALConfig.cmake for pure header-only 2017-03-27 18:04:53 +02:00
Laurent Rineau 7c18b22b4c Fix CGAL_TweakFindBoost 
That module was using the useless macros `cache_set` and
`add_to_cached_list`.
 2017-03-27 18:04:53 +02:00
Laurent Rineau fa0d681c23 Simplify and fix CGALConfig.cmake for header-only2 2017-03-27 18:04:53 +02:00
Laurent Rineau 1f3ba3c7ab Improvements to CGAL_HEADER_ONLY 
- Now `<CGAL/compiler_config.h>` is no longer used.
  - GMP and MPFR are assumed.
- `<CGAL/version.h>` is in the distribution.
 2017-03-27 18:04:52 +02:00
Laurent Rineau c68488969d Remove debug messages 2017-03-27 18:04:52 +02:00
Laurent Rineau 9c96205a38 First prototype of a pure CGAL_HEADER_ONLY 
That is the step 2 of the header-only effort.

Still to do:

  - make it work with `make install`
  - ensure that `CGAL_Core` is correctly handled with `CGAL_DISABLE_GMP`
 2017-03-27 18:04:41 +02:00
Andreas Fabri b168a60c35 removed README 2008-12-12 08:18:38 +00:00
Fernando Cacciola 4a4d927522 Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
Laurent Rineau 46b70b7c25 Fix again FindQGLViewer.cmake so that it deals with debug and release 
libraries, even on Linux where only the release one exists.

Rename QGLVIEWER_LIBRARY to QGLVIEWER_LIBRARIES (-IES), to mimic other
CMake packages.
 2008-11-27 15:20:46 +00:00
Fernando Cacciola 82047a7559 Fixed unnecessary tagged libraries stuff 2008-11-26 15:26:36 +00:00
Laurent Rineau 2d54bbdf5f s/WARNING:/NOTICE:/ so that one can have a blue 'r' (missing requirement) 
instead of a yellow 'y' (warning) in test results.
 2008-11-25 22:28:41 +00:00
Fernando Cacciola 09cc8a35db Added macros to properly arranged tagged libraries listings 2008-11-21 19:00:02 +00:00
Laurent Rineau f336f4340e Followup to revision 46844. 
Attempt to search in $QTDIR/bin first, before searching in $PATH.
 2008-11-19 13:52:09 +00:00
Michael Kerber 86fe5c6df1 LEDA Version is detected also when path and lib are passed by cmake-arguments 2008-11-18 09:32:12 +00:00
Laurent Saboret fdf2b32c26 - Removed CGAL_USE_BLAS/CGAL_USE_LAPACK #defines (unused). 
- Do not call find_package() anymore.

- Protect scripts against multiple inclusions.
 2008-11-17 10:39:37 +00:00
Laurent Saboret 9b6db227a8 - Bug fix: force variables value in cache. 
- Removed QUIET parameter from calls to find_package().
 2008-11-17 10:37:22 +00:00
Andreas Fabri f31433798a LaurentS's fixes for cmake cache 2008-11-14 15:21:32 +00:00
Fernando Cacciola 7062842d64 Fixed LEDA version detection 2008-11-13 18:01:24 +00:00
Laurent Saboret bcb9e6a8af - Make sure that FindLAPACK.cmake always calls find_package(BLAS). 
- Added BLAS_INCLUDE_DIR and LAPACK_INCLUDE_DIR to support CBLAS/CLAPACK on Windows. This is the default on win64.
 2008-11-13 17:22:53 +00:00
Laurent Rineau 62e8f40ba3 Call find_package(BLAS QUIET), even if LAPACK_LIBRARIES_DIR or 
LAPACK_LIBRARIES is set.
 2008-11-13 10:55:13 +00:00
Laurent Rineau 3ba325a39e Typo. That made CGAL-3.4-I-494's test suite be fully red. 2008-11-13 09:17:06 +00:00
Laurent Saboret 6c2703299f Special case for autotest_cgal_with_cmake: 
On Windows/VC++, $CGAL_TAUCS_DIR can point to a folder containing the output of
build_taucs_win32_for_CGAL.bat/build_taucs_win64_for_CGAL.bat,
ie TAUCS libraries compiled for all Windows runtimes.
 2008-11-12 17:32:35 +00:00
Laurent Saboret cbee4a7769 Code cleaning 2008-11-12 17:18:48 +00:00
Laurent Saboret f66afc0c1f Bug fix: 
Fix use of BLAS_LIB_DIR and LAPACK_LIB_DIR environment variables.
 2008-11-12 17:14:14 +00:00
Laurent Saboret f7909a4674 - Code cleaning: 
Add back CGAL_USE_TAUCS, CGAL_USE_BLAS, CGAL_USE_LAPACK #defines. Only CGAL_USE_TAUCS is currently used. The others are defined by symmetry with other third-party libraries.

- Bug fix: 
Call find_package(LAPACK) before including CGAL_UseLAPACK.cmake. 
Idem for BLAS.
 2008-11-12 17:11:22 +00:00
Laurent Rineau 3192eeb9d8 Fix my stupid revision 46847: "Do not display "Building (shared|static) 
libraries" during the configuration of an example or a demo."
 2008-11-12 17:00:52 +00:00
Fernando Cacciola 353864cf4a Added workaround to SET bug in cmake 2.6 
Added link_libraries in UseCGAL (but did not remove target_link_libraries from the programs)
 2008-11-12 16:49:55 +00:00
Laurent Rineau 2cabf4a168 Do not display "Building (shared|static) libraries" during the 
configuration of an example or a demo.
 2008-11-12 15:00:15 +00:00
Laurent Rineau 4f69d413d6 Attempt to fix Qt3 support when Qt4 is installed and /usr/bin/qmake is 
Qt4's one.
 2008-11-12 13:24:34 +00:00
Laurent Rineau dc59756edd Use get_dependency_version(LEDA). That will compile and run 
config/support/print_LEDA_version.cpp
 2008-11-12 10:37:36 +00:00
Fernando Cacciola 48f5914fc0 Renamed the cmake variable CGAL_LEDA_VERSION as LEDA_VERSION for consistency with all the other LEDA related cmake variables 2008-11-10 16:10:21 +00:00
Laurent Rineau 38e5a4ebf5 Fix the use of Boost program options. 2008-11-10 10:23:40 +00:00
Fernando Cacciola f03d9122b2 Fixed uniquely_add_flags for multiple flags added in the same call as it happens when the reference cache is loaded 2008-11-07 18:11:04 +00:00
Fernando Cacciola 5baa371e4c Fixed link order 2008-11-07 18:09:47 +00:00
Fernando Cacciola 0d67a24c0f Allow users to secify DEBUG and RELEASE variants of the leda libs 2008-11-07 17:12:08 +00:00
Fernando Cacciola eb788696c8 Fixed GNUCC->GNUCXX and detection of GCC 2008-11-07 16:46:03 +00:00
Fernando Cacciola 17389a0ed8 Override fags from CGALConfig in the cache as well as in memory 2008-11-07 16:44:23 +00:00
Laurent Rineau 1fd219bf27 Fix a comment in endif() and remove the "echo Coucou" that I inserted for 
easy debugging.
 2008-11-07 15:10:08 +00:00
Laurent Rineau 61925b0d2b Followup to revision 46743: 
"  Modify the BLAS/LAPACK/TAUCS support to mimic other FindXYZ.cmake modules:
    - a XYZ_USE_FILE variable is defined,
    - the module ${XYZ_USE_FILE} is responsible for using the variables defined 
      by FindXYZ.
"

I should have tested that before the commit.
 2008-11-07 15:00:33 +00:00
Laurent Rineau bf093806d7 Modify the BLAS/LAPACK/TAUCS support to mimic other FindXYZ.cmake modules: 
- a XYZ_USE_FILE variable is defined,
  - the module ${XYZ_USE_FILE} is responsible for using the variables defined 
    by FindXYZ.
 2008-11-07 14:37:14 +00:00
Laurent Rineau fe3c92fe42 In testsuite, we want the default built type to be "Debug", and not 
"Release".
 2008-11-06 10:40:43 +00:00
Fernando Cacciola aea1cd261c Fixed CGALConfig overriding 2008-11-05 17:02:33 +00:00
Laurent Saboret 3fc829bd02 Fixed crashing bug on MacOS X: 
Search BLAS/LAPACK Fortran interface before the C interface, because the Fortran interface is standardized and the C one not. CGAL supports currently only ACML C interface.
 2008-11-05 12:45:57 +00:00
Laurent Saboret 6fe6e23bd8 Include CGAL_GeneratorSpecificSettings to define CGAL_AUTO_LINK_ENABLED 2008-11-05 12:42:49 +00:00
Fernando Cacciola 8e65f1a63d renamed cmake/modules to lib/CGAL-3.4 (1.5/1) 2008-11-04 16:03:27 +00:00
Fernando Cacciola 015e9639aa renamed cmake/modules to lib/CGAL-3.4 (1/1) 2008-11-04 16:02:15 +00:00
Laurent Saboret 24c27026ba Move packages to trunk root 2006-02-14 08:58:15 +00:00