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

109 Commits

Author SHA1 Message Date
Laurent Rineau e260ea1dd4 C++11: remove the need for Boost.Thread, even with CGAL_Core 2019-06-18 15:06:23 +02:00
Laurent Rineau 471e7a93be Deal with Qt5 and Boost imported targets, when CGAL is imported 
When CGAL_Qt5 or CGAL_Core targets are imported, then we need to call
`find_package(Qt5)` and `find_package(Boost)` to re-import the
targets of Qt5 or `Boost::thread`.

Otherwise, there is that CMake warning:

    CMake Warning (dev) at /mnt/testsuite/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:49 (add_executable):
      Policy CMP0028 is not set: Double colon in target name means ALIAS or
      IMPORTED target.  Run "cmake --help-policy CMP0028" for policy details.
      Use the cmake_policy command to set the policy and suppress this warning.

      Target "test_Min_circle" links to target "Boost::thread" but the target was
      not found.  Perhaps a find_package() call is missing for an IMPORTED
      target, or an ALIAS target is missing?
    Call Stack (most recent call first):
      CMakeLists.txt:22 (create_single_source_cgal_program)
    This warning is for project developers.  Use -Wno-dev to suppress it.

and then that link error:

    /usr/bin/ld: cannot find -lBoost::thread

Ref:
  https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-200/Bounding_volumes/TestReport_lrineau_Fedora-Release.gz
 2018-03-16 11:42:01 +01:00
Laurent Rineau 68a48e6b91 Remove obsolete code 
Now that we use imported target, or aliases, then that code with lots
of `find_package` is no longer used.
 2018-03-14 23:06:19 +01:00
Laurent Rineau 777717ba7e Move config/ to cmake/modules/config/ 
That way, the directory will be installed along with CMake modules.
 2017-12-06 12:53:05 +01:00
Laurent Rineau 4343b756f0 Merge pull request #2636 from maxGimeno/Add_make_install_tests-GF 
Test make install in travis

# Conflicts:
#	Installation/cmake/modules/CGAL_Macros.cmake
 2017-12-05 18:25:59 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 4267df0a78 Fix get_dependency_version(..) when CGAL is installed 
.. That is not really a fix, but any I plan to remove that code soon or
later!
 2017-11-28 14:13:31 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 264c23294f Ease the cross-compilation 2017-11-14 10:38:51 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau 
CGAL testsuite implemented with CTest plus Python (part.1)
 2017-11-13 11:13:54 +01:00
Laurent Rineau e73c95d4cd Do not test demos 2017-10-20 17:01:43 +02:00
Laurent Rineau c2fd460927 Use CGAL::CGAL_<lib> instead of CGAL_<lib> 2017-03-27 17:23:26 +02:00
Laurent Rineau d87cfd9ed5 CMake: If MSVC/C++11, do not search for Boost.Thread for CGAL_Core 
See for example that error, on a Windows platform that does not have any
compiled Boost libraries.

https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.10-Ic-121/Polygon_Demo/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Debug-64bits.gz
 2017-02-09 12:46:36 +01:00
Laurent Rineau b73a88babc CGAL_Core MemoryPool<T> will always use Boost.Thread with g++ 
Because of bug in gcc, even if the C++11 `thread_local` keyword can be
used, it cannot be used for the TLS static member of the class template
`MemoryPool<T>`. That triggers a bug in gcc (tested with g++ 6.3.1):
```
.../include/CGAL/CORE/MemoryPool.h:113:25: error: redefinition of 'bool __tls_guard'
 MemoryPool<T, nObjects> MemoryPool<T, nObjects>::memPool;
                         ^~~~~~~~~~~~~~~~~~~~~~~
.../include/CGAL/CORE/MemoryPool.h:113:25: note: 'bool __tls_guard' previously declared here
.../include/CGAL/CORE/MemoryPool.h:113: confused by earlier errors, bailing out
Preprocessed source stored into /tmp/cc4xCWuR.out file, please attach this to your bugreport.
```

The bug seems to be from g++ >= 5:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54948
 2017-02-08 17:05:13 +01:00
Laurent Rineau 87a2248ab6 Do no test demos 
New directory property named `CGAL_NO_TESTING`. If set to `TRUE`, then
the automatic generating of CTest test will be disabled.

(cherry picked from commit 5d540fc1989c86438090b0212883b15cd121cf92)
 2016-09-30 19:58:56 +02:00
Thiago M. de C. Marques 6cfa204b29 Fixes the version compatibility to `SameMajorVersion` 
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78162752
 2016-09-09 08:32:30 -03:00
Thiago M. de C. Marques 9c338ad61a Removes the copy of the package version file to the build config folder 
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78147435
 2016-09-09 08:32:21 -03:00
Thiago M. de C. Marques a24dd7dd1c Adds CMake package version file generation 
This allows clients to specify a minimum CGAL version in their CMake list files.
Eg.:

    find_package(CGAL 4.9)

More info: https://cmake.org/cmake/help/v3.6/manual/cmake-packages.7.html#package-version-file
 2016-09-08 21:14:20 -03:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Guillaume Damiand 7717bc83b4 ImageIo does not need opengl nor vtk 2016-06-28 11:29:51 +02:00
Clement Jamin b175d15421 Simplify test 2016-06-15 11:49:58 +02:00
Clement Jamin 561bd80d96 On Windows, OPENGL_INCLUDE_DIR is empty even when OpenGL is found 2016-06-10 15:05:16 +02:00
Guillaume Damiand b8d2782e39 Remove empty include directory directive. 2016-06-09 16:19:55 +02:00
Guillaume Damiand a5e04dcfd0 Update cmakes to deal with ZLIB in header only mode. 2016-06-09 15:39:56 +02:00
Guillaume Damiand 89edc17cb1 Add quit to find_package; and improve error message for Qt5 2016-06-03 09:25:54 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Guillaume Damiand 0f0aa9f764 Remove the find_package qt5 do in CGAL_Macros.cmake which is now done in CGALConfig_binary.cmake.in 2016-03-09 10:50:53 +01:00
Guillaume Damiand 38ca4dd5e0 Bugfix in check_cgal_component for its first call. 2016-03-09 10:42:46 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00
Guillaume Damiand d56092753a Make enable_header_only option persistent 2016-03-09 10:35:21 +01:00
Philipp Möller 0a685e82b3 Remove CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT from Macros 
This is the only place that uses the option. Because the code was
wrongly indented (several ifs missing a level) the removal looks
horrible.
 2016-02-16 17:21:23 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Laurent Rineau 3262264cbd Search dependencies quietly 2015-07-14 15:12:47 +02:00
Sébastien Loriot 89184387d6 remove no longer needed QT4 cmake scripts 2015-07-07 18:00:43 +02:00
Maxime Gimeno fa430e5fc0 WORK IN PROGRESS 2015-03-31 11:05:17 +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
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