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

76 Commits

Author SHA1 Message Date
Laurent Rineau f37ac9cfc6 Fix non-header-only CGALConfig.cmake as regards to CGAL_Core 
... and then fix the `CMakeLists.txt` of HDT2_demo.
 2019-02-04 15:09:07 +01:00
Laurent Rineau 0c1517d97e Merge pull request #3446 from sloriot/Installation-extra_slash 
Clean-up include dir in CGALconfig.cmake
 2019-01-22 09:15:24 +01:00
Sébastien Loriot 66f2d5404e remove extra / 2018-11-08 17:12:12 +01:00
Guillaume Damiand 0c3878694b Include CGAL_Common.cmake, where variable EIGEN3_USE_FILE is defined. 2018-11-06 11:03:59 +01: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 4070f70d4b Fix issue #1580 
Fix the issue "CMake error when WITH_CGAL_Qt5 is set to ON then
OFF" (#1580).

The previous CMake code was using a `file(GLOB)` to discover the list
of configured libraries, whereas that list is known by CMake.
 2018-03-14 16:33:11 +01:00
Laurent Rineau 69ca424c5e Add CGAL_DEV_MODE 2018-02-06 15:08:54 +01:00
Laurent Rineau c08329e93f Fix the use of Boost, on Windows 
Now the branch requires CMake>=3.5. For CMake between 3.1 and 3.4,
included, it is not possible to compile CGAL libraries using C++11 or
later, and then compile a user program with C++03.
 2018-01-04 11:45:40 +01:00
Laurent Rineau 1016c43195 Fix detection of Boost.Thread vs. C++11 
This allows to build CGAL non-header-only with C++11, and then use C++03 is
a user-project: the need for Boost.Thread is reevaluated.
 2017-12-19 15:56:30 +01:00
Laurent Rineau 477b12dd83 Hack for the CGAL test suite (cont.) 
Follow-up to:
> commit 249aed9fd1
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date:   Thu Nov 23 17:06:21 2017 +0100
>
>     Hack for the CGAL test suite
 2017-11-30 11:15:38 +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 19c5502ca8 Fix compilation of demos in non-header-only 
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
 2017-11-22 12:45:21 +01:00
Clement Jamin 6af02862de This comment is not true anymore 2017-03-27 17:23:27 +02:00
Clement Jamin 23a1c3ee54 Revert "This only has to be done in header-only mode" 
This reverts commit ff3b3b01ab96485cd32564175833b68044806bee.
 2017-03-27 17:23:27 +02:00
Clement Jamin 6f0efd931f Remove useless test 2017-03-27 17:23:26 +02:00
Laurent Rineau 5d5f6d4dae include CGAL_Macros.cmake in the CGALConfig.cmake 2017-03-27 17:23:26 +02:00
Clement Jamin dfb24b5340 Add comments 2017-03-27 17:23:26 +02:00
Clement Jamin b9909ddfb5 This only has to be done in header-only mode 2017-03-27 17:23:26 +02:00
Laurent Rineau a3ddaa132f Define and use a new CMake API for CGAL 
For the moment, the new API is used only in:

- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
 2017-03-27 17:23:26 +02:00
Clement Jamin a2a3ad29b4 Use CGAL_SetupCGAL_Qt5Dependencies + remove useless test 2017-03-27 17:23:26 +02:00
Sébastien Loriot f674cc1cd1 add a hardcoded fall back for the installation prefix 
in case of no common setting, the installation cannot be
relocated automatically
 2016-10-31 15:52:11 +01:00
Laurent Rineau e5b441feaa Fix CGAL_VERSION in CGALConfig.cmake 2016-10-10 12:31:21 +02:00
Guillaume Damiand 157f2507cf Re-add find_package(Qt5 QUIET COMPONENTS OpenGL Svg) and find_package(OpenGL QUIET) in CGALConfig; they are required in header only mode 2016-06-24 18:58:44 +02:00
Guillaume Damiand c4758f091a Simplify CGALConfig files: we do not need anymore to find zlib, nor opengl. 2016-06-24 14:38:28 +02:00
Guillaume Damiand e21ef313c0 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 20:54:37 +02:00
Guillaume Damiand 50125f1d53 First try to use an interface target in header only; in order to allow to link with this fictive target. 2016-06-22 13:44:50 +02:00
Guillaume Damiand f6428de32c include only .cmake file when they exist. 2016-06-21 19:08:06 +02:00
Guillaume Damiand 276c8271ab Remove a debug message 2016-06-21 12:27:44 +02:00
Guillaume Damiand 1f40288aa3 Update cmakes in order to deal with install version of CGAL in header only mode. 2016-06-21 11:20:28 +02:00
Sébastien Loriot 0b8115daff Make CGAL installation relocable 2016-06-16 11:11:46 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau 5b48eedf20 Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller 
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
 2016-03-24 11:30:14 +01:00
Laurent Rineau 31d416df4e Fixes the PR #788 
With the split of `CGALConfig.cmake` into several files, one for each
lib, then the variable `CGAL_ImageIO_USE_ZLIB` was no longer stored in
`CGALConfig.cmake`.

That led to a full blue line in the testsuite:
  https://cgal.geometryfactory.com/CGAL/Members/testsuite/results-4.8-Ic-155.shtml#Mesh_3_Examples
 2016-03-10 11:56:55 +01:00
Guillaume Damiand bcd3b6cde3 Remove unused variable 2016-03-09 17:31:24 +01:00
Guillaume Damiand 24b156e3c6 Add cgal header only also in CGALConfig_install.cmake.in 2016-03-09 16:38:54 +01:00
Guillaume Damiand b9d209ee62 Search required third party library in find component macro. 2016-03-09 12:41:42 +01:00
Guillaume Damiand 94f2565c6a Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY 2016-03-09 10:56:11 +01:00
Guillaume Damiand dff63d83d3 Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5. 
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
 2016-03-09 10:44:15 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Sébastien Loriot a3ba66c458 include export and lib config files on demand 2016-03-04 12:05:25 +01:00
Philipp Möller ecb34b3031 Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT 
Do not add it to Config.cmake files anymore and remove it from the
interface
 2016-02-16 17:20:22 +01:00
Philipp Möller 732d6ccb96 Generate a config file for each lib 2016-02-16 17:02:56 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Laurent Rineau fb4975f469 Check if the libraries are actually defined 
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
 2015-07-14 15:12:47 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller 
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
 2015-07-10 14:03:20 +02:00
Philipp Möller e7a6f80f05 Check for MSVC when defining library paths 
We do not know the value of CGAL_AUTO_LINK_ENABLED yet because it is
defined by CGAL_GeneratorSpecificSettings.cmake but this is
equivalent. This is also not a problem, because CGAL_AUTO_LINK_ENABLED
is not user-editable and always enabled on MSVC.
 2015-06-24 17:21:37 +02:00
Philipp Möller 8b6acec1b3 Use the LOCATION property to set _LIBRARY variables 
Inspect the imported targets for information instead of using
configure_file.
 2015-06-23 17:59:48 +02:00
Philipp Möller 9e807d8e2d Include the export files through CGALConfig 2015-06-23 16:30:46 +02:00
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