Commit Graph

854 Commits

Author SHA1 Message Date
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau b86532d357 Merge pull request #3830 from lrineau/Installation-fix_Windows_DLL_verinfo-lrineau
Fix CGAL DLLs verinfo on Windows
2019-04-08 15:57:31 +02:00
Laurent Rineau d07a2c9184 Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
There was a bug in `FindGMP.cmake` and `FindMPFR.cmake`: they were
using the undefined macro `cache_set`.

I have removed those variables definitions, and wrote the code
differently where they were used.
2019-04-04 15:25:01 +02:00
Laurent Rineau 85047bcb61 Sneak a new feature in this branch: detect unused .cpp files
For the moment, the feature is far from being ready:

- in case of header-only, the .cpp sources files of CGAL libraries are
  reported,

- when a dependency for a test/examples is missing, the corresponding
  .cpp files is reported,

- and I have no clue which CMake version is required.

But I found real issues.

By default, the feature is OFF. It will only be activated if the CMake
variable or cache variable `CGAL_CHECK_UNUSED_CPP_FILES` is true. We
might activate it on a per-directory basis... or have it by default,
and deactivate it per-directory. We'll see. For the moment, let's keep
it deactivated.
2019-04-03 14:11:50 +02:00
Laurent Rineau 8539c09179 CGAL requires C++14. 2019-04-01 18:35:58 +02:00
Laurent Rineau 84b9328619 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-29 15:49:12 +01:00
Laurent Rineau 8c4032262f Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
Fix the order of link when GMP is a static lib
2019-03-28 16:49:51 +01:00
Laurent Rineau 4b7cc4a896 Fix the order of link of GMPXX when GMP is a static library. 2019-03-28 09:04:03 +01:00
Laurent Rineau c988d7d1af Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
Fix the order of link when GMP is a static lib
2019-03-27 18:04:59 +01:00
Laurent Rineau 310ce89b91 Fix the order of link when GMP is a static lib 2019-03-27 17:51:24 +01:00
Laurent Rineau ea145c71fe Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
Testsuite : Use ctest
2019-03-26 17:01:56 +01:00
Laurent Rineau bc6954af01 Fix an error in Fedora RPM
```
CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp
```
https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:00 +01:00
Maxime Gimeno 43167252fa Fix cin management in CGAL_add_tests 2019-03-21 11:37:39 +01:00
Laurent Rineau 6eab4c014c Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH 2019-03-21 09:52:53 +01:00
Maxime Gimeno 1a6ef33010 WIP from git and upload to private page 2019-03-14 16:36:11 +01:00
Maxime Gimeno 64cfc19d68 Remove -d option. Any HOST declared as not localhost will be considered as a remote host and launch the cross compilation. 2019-03-12 14:58:11 +01:00
Maxime Gimeno 7c0d23b18f Fix CGAL_DIR and change names in CGAL_add_tests 2019-03-12 10:13:07 +01:00
Laurent Rineau ca67ac5c1f Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts 2019-03-07 09:40:08 +01:00
Maxime Gimeno aa76cd02b6 Use a single script for testsuite with or without docker 2019-03-06 14:17:48 +01:00
Maxime Gimeno 17079b0d53 Kill remote process if ssh is killed (ctrl+c or timeout) 2019-03-01 15:43:58 +01:00
Maxime Gimeno 902070d4d1 Add a label for push__oh_ 2019-02-28 16:32:01 +01:00
Maxime Gimeno 7407a432ce Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF 2019-02-28 11:59:04 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
Maxime Gimeno 42f3928de3 Fix CGAL_DISABLE_GMP 2019-02-22 16:00:53 +01:00
Laurent Rineau 7cf4a1fff8
Merge pull request #3501 from lrineau/CGAL-fix_with_LEDA_without_CGAL_Core-GF
Partially fix the testsuite with LEDA instead of GMP
2019-02-22 10:04:22 +00:00
Laurent Rineau 5376673151 Fix the testsuite of Arrangement_on_surface_2 2019-02-21 17:00:53 +01:00
Maxime Gimeno 13e7f7633c Fix push__of_ in arrangement 2019-02-21 16:56:34 +01:00
Laurent Rineau 2ddee24f1a Fix the dependencies 2019-02-21 16:09:42 +01:00
Laurent Rineau 1e17519384 Fixes
- The dependencies of push_of__ tests were not correct.
- Fix the handling of tests with .cin, when ssh/scp are used.
2019-02-21 15:49:48 +01:00
Maxime Gimeno c01eddb62a Remove unused LD_LIBRARY_PATH 2019-02-21 15:47:12 +01:00
Maxime Gimeno a52f7198d2 WIP SSH 2019-02-20 16:46:28 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Laurent Rineau 9b71af64c8 Add -Wno-cast-function-type to fix a warning in Qt5
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.14-Ic-117/Polyhedron_Demo/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
```
/usr/local/bin/c++  -DCGAL_EIGEN3_ENABLED -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -DCGAL_USE_ZLIB=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSCENE_IMAGE_GL_BUFFERS_AVAILABLE -DUSE_FORWARD_DECL -Dpolyhedron_demo_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/polyhedron_demo_autogen/include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./CGAL_demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/. -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include -isystem /usr/include/eigen3 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtOpenGL -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtSvg -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/x86_64-linux-gnu/qt5/QtScript  -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math -fPIC   -Wno-deprecated-copy -Wall -frounding-math -fPIC -std=gnu++11 -o CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtScript/QScriptEngine:1,
                 from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.h:10,
                 from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:4:
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h: In instantiation of 'int qScriptRegisterMetaType(QScriptEngine*, QScriptValue (*)(QScriptEngine*, const T&), void (*)(const QScriptValue&, T&), const QScriptValue&, T*) [with T = CGAL::Three::Scene_item*]':
/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:313:67:   required from here
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:390:18: warning: cast between incompatible function types from 'QScriptValue (*)(QScriptEngine*, CGAL::Three::Scene_item* const&)' to 'QScriptEngine::MarshalFunction' {aka 'QScriptValue (*)(QScriptEngine*, const void*)'} [-Wcast-function-type]
  390 |         eng, id, reinterpret_cast<QScriptEngine::MarshalFunction>(toScriptValue),
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:391:9: warning: cast between incompatible function types from 'void (*)(const QScriptValue&, CGAL::Three::Scene_item*&)' to 'QScriptEngine::DemarshalFunction' {aka 'void (*)(const QScriptValue&, void*)'} [-Wcast-function-type]
  391 |         reinterpret_cast<QScriptEngine::DemarshalFunction>(fromScriptValue),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
2019-02-07 17:49:14 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
Laurent Rineau 0ca486665a Merge pull request #3654 from maxGimeno/Triangulation_fix_tests_for_clang-GF
Triangulation: Fix the tests for GCC<4.4 so it wont match clang.
2019-02-07 13:30:46 +01:00
Laurent Rineau 27f1dc4a62 Do no always search for GMPXX
There is a kind of bug in `UseCGAL.cmake`, that enables GMPXX if it is
found, even if `WITH_GMPXX` is `OFF`. If GMPXX is never search for,
that should avoid it to be accidentally activated on platforms we do
not want it.
2019-02-07 10:12:51 +01:00
Laurent Rineau 2455affba0 Move the addition of -Wno-deprecated-copy to CGAL_Qt5 setup
That way:
  - that will work, even if CGAL CXX_FLAGS are copied (when hte CMake
    options `CGAL_DEV_MODE` or `RUNNING_CGAL_AUTO_TEST` are `ON`),
  - that will affect all CGAL Qt5 demos at once.
2019-02-06 11:47:44 +01:00
Laurent Rineau 02690350ee Replace include(CTest) by minimal usage
- Define the option `BUILD_TESTING`
- Call to `enable_testing()` if `BUILD_TESTING` is on.
2019-02-04 15:30:24 +01:00
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
Maxime Gimeno de8dde79f4 Replace not by ! in preprocessor directives 2019-02-04 10:40:00 +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
Laurent Rineau a8c6505642 Merge pull request #3446 from sloriot/Installation-extra_slash
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:13:23 +01:00
Simon Giraudot dc9d52f485 Update filename in whitelisted headers 2019-01-10 11:08:56 +01:00
Simon Giraudot 3cc1b995be Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF 2018-12-21 10:31:00 +01:00
Simon Giraudot 847a6d8a8f Add TensorFlow_neural_network_classifier to whitelisted headers 2018-12-14 10:22:11 +01:00
Laurent Rineau c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF 2018-12-10 16:52:33 +01:00
Laurent Rineau a328ce9470 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2018-12-10 15:07:12 +01:00
Laurent Rineau 950fd19be6 Merge pull request #3482 from lrineau/Installation-LEDA_remove_ffriend_injection-GF
Try to use LEDA without -ffriend-injection
2018-12-10 14:38:23 +01:00
Simon Giraudot f520f9eb11 First version of NN with TensorFlow 2018-12-06 14:59:57 +01:00
Laurent Rineau a9ef1dd0a5 Really test with LEDA!! 2018-11-30 16:56:08 +01:00
Laurent Rineau 263a5715f2 Try to use LEDA without -ffriend-injection 2018-11-26 16:34:12 +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
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
Sébastien Loriot 9e9df2c196 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2018-11-02 10:55:57 +01:00
Maxime Gimeno 50108dc627 Fix wrong policy setting 2018-10-29 14:25:47 +01:00
Laurent Rineau f8a37e59ef Fix issue #3317 by removing the unused module FindGLEW.cmake 2018-09-17 14:41:54 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Laurent Rineau 919b9afe92 Merge pull request #3229 from lrineau/Installation-fix_compatibility_with_CMake_3.13-GF
Set CMP0077 to OLD (new in CMake-3.13)
2018-07-16 11:12:56 +02:00
Laurent Rineau 6079b3847e Set CMP0077 to OLD (new in CMake-3.13) 2018-07-13 11:24:50 +02:00
Laurent Rineau ab973c90e0 Merge pull request #2739 from lrineau/Mesh_3-improve_polylines_to_protect-GF
Mesh_3 new improvements: polylines_to_protect(), new API of Labeled_mesh_domain_3
2018-06-01 17:25:52 +02:00
Maxime Gimeno fbe5ee39c7 Update cmake files 2018-05-28 17:18:59 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 265a81bf76 Merge pull request #2967 from maxGimeno/CGAL-With_QGLViewer-GF
CGAL_Qt5: include QGLViewer
2018-05-28 13:58:10 +02:00
Laurent Rineau 39c913a090 CERR: create the file before using it 2018-05-24 14:44:48 +02:00
Laurent Rineau 4ba33e17d3 Run the compiler a second time without -H in case of errors 2018-05-23 15:09:53 +02:00
Laurent Rineau 95edcb3778 Fix compilation error in header-only 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 9c1c0b027a Fix UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Laurent Rineau d03f76cd78 Remove that annoying warning
When a user-project is compile from a Git repository, there was that
annoying warning about the project not being developed in the same branch
as CGAL itself!
2018-05-15 14:56:22 +02:00
Laurent Rineau c180c0678d Fix LEDA support with gcc 2018-04-26 14:59:24 +02:00
Laurent Rineau ee61c2752c Fix CMake scripts when GMP or MPFR is found under auxiliary/ 2018-04-16 18:21:08 +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 bd14587987 Fix GMPXX 2018-04-04 10:56:53 +02:00
Laurent Rineau 7bb25993d6 GMPXX: Add CGAL_USE_GMPXX in header-only 2018-04-03 17:31:52 +02:00
Laurent Rineau 1384d24b99 add GMPXX support (work in progress) 2018-04-03 17:22:45 +02:00
Laurent Rineau b262232f49 Remove the warnings from the testsuite
In the testsuite, with `RUNNING_CGAL_AUTO_TEST`, the message will end with:
> Set CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE to TRUE if you want to
> disable this notice.

instead of

> disable this warning.

Because otherwise our test results are full of yellow 'w' (warnings).
2018-03-22 13:11:29 +01:00
Laurent Rineau 1d0663da1d Remove one misleading sentence 2018-03-20 17:53:50 +01:00
Laurent Rineau 671933072c Guard the inclusion 2018-03-20 17:09:57 +01:00
Laurent Rineau f3b4302a08 Document the hook 2018-03-20 17:08:52 +01:00
Laurent Rineau 2d1cb94f5b Only monitor the accesses of type MODIFIED_ACCESS 2018-03-20 17:08:52 +01:00
Laurent Rineau 30df6e803a CGAL_DEV_MODE: Release is now the default CMAKE_BUILD_TYPE
Even for a CGAL developer, Release is what we want, unless we really want
to open a debugger.
2018-03-20 17:08:52 +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 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 af6d9ab3bb Better calls to find_package(Boost) for CGAL::CGAL_Core 2018-03-14 23:07:02 +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 b4534f51b4 Remove the duplicate -DCGAL_HEADER_ONLY 2018-03-14 23:06:01 +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 c17e0497ae Store values in global properties
When `WITH_{examples|demos|tests}` is `ON`, `CGAL_SCM.cmake` is
included by each sub-directory. With this patch, the values of
`CGAL_SCM_BRANCH_NAME` and `CGAL_CREATED_GIT_HASH` are stored in
global properties, and retrieved, instead of forking two `git` at each
use of the module.
2018-03-14 22:38:05 +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 e60ad2ac48 Fix bug introduced by PR #2846
If one tries to configure CGAL libraries with `CGAL_HEADER_ONLY=ON`,
but with `WITH_{examples|demos}` then one must define the target
`CGAL_Qt5_moc_and_resources`.

The bug was introduced by:
https://github.com/CGAL/cgal/pull/2846/files#diff-1f18376f411977629f9d9d36d018438dL54
2018-03-14 15:35:27 +01:00
Laurent Rineau a06d390fd4 Merge pull request #2910 from luis4a0/Algebraic_kernel_d-RS_MPFR_compatibility-Luis
Algebraic kernel d RS-Fix compatibility of MPFR, MPFI and RS.
2018-03-09 18:41:16 +01:00
Luis Peñaranda a8c8d6f152 Fix MPFR/MPFI check when MPFI is not present. 2018-03-08 10:05:26 -03:00
Luis Peñaranda ec8ddadac8 Check that MPFR/MPFI versions match.
MPFI >=1.5.2 only works with MPFR >=4.0.0.
MPFI < 1.5.2 only works with MPFR < 4.0.0.
This check is performed at CMake level, when configuring MPFI.
2018-03-08 10:12:42 +01:00
Laurent Rineau 3768e905ae Fix CGAL_ENABLE_CHECK_HEADERS
List of the fixes:

- The headers from the .cpp files were not processed (wrong regular
  expression for `awk`),

- `CGAL_COMPUTE_DEPENDENCIES` is now removed (unified with
  `CGAL_ENABLE_CHECK_HEADERS`).

- All `dependencies` files has an empty line (because of
  `include/CGAL/version.h` in the build directory).

- Fix the name of the target `pkg_<package>_deps`
2018-03-06 18:43:39 +01:00
Laurent Rineau c64596903d Set the default value of CGAL_DEV_MODE from the env variable
If the environment variable `CGAL_DEV_MODE` is set to a "true" value,
according to CMake, then the `CGAL_DEV_MODE` CMake option is `ON` by
default.

https://cmake.org/Wiki/CMake/Language_Syntax#CMake_supports_boolean_variables.

> CMake considers an empty string, "FALSE", "OFF", "NO", or any string
> ending in "-NOTFOUND" to be false. [..] Other values are true.
2018-02-21 15:32:56 +01:00
Laurent Rineau e6967d0887 Merge pull request #2846 from lrineau/Installation-fix_CGAL_HEADER_ONLY-GF
Fix CGAL_HEADER_ONLY
2018-02-19 14:28:43 +01:00
Laurent Rineau 7e8e70a005 Merge pull request #2799 from lrineau/Installation-Add_CGAL_DEV_MODE-GF
Add CGAL_DEV_MODE
2018-02-19 14:27:33 +01:00
Laurent Rineau 9b06a70e91 Merge pull request #2819 from afabri/CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF
Address the warning concerning SCL_SECURE for VC++
2018-02-19 14:26:23 +01:00
Laurent Rineau dd739cd31b Do not declare the target CGAL_Qt5_moc_and_resources when useless
- .. if `CGAL_HEADER_ONLY` is not true,
- or if CMake is configuring CGAL "libraries".
2018-02-15 15:52:38 +01:00
Laurent Rineau 4e0cc55e4c Fix the CMake error
CMake does not like that the documentation of a CMake cache variable is
multiline. That triggers an error once the cache is re-loaded, the second
time.
2018-02-14 16:23:19 +01:00
Laurent Rineau 9a80f5ddd8 Merge pull request #2800 from jasjuang/master
prevent GCC flags propagating to NVCC, fixes #2775
2018-02-14 15:34:23 +01:00
jasjuang de47e36dac prevent GCC flags propagating to NVCC, fixes #2775 2018-02-09 09:46:50 -08:00
Andreas Fabri abe933a684 Address the warning concerning SCL_SECURE for VC++ 2018-02-09 15:00:14 +00:00
Maxime Gimeno a481d2651c Clean-up 2018-02-09 10:25:39 +01:00
Laurent Rineau 69ca424c5e Add CGAL_DEV_MODE 2018-02-06 15:08:54 +01:00
Maxime Gimeno 533fa91f41 remove classic package installation becaus eit is supposed to happen in install.sh 2018-02-02 12:08:05 +01:00
Maxime Gimeno 21745bea1e Ignore packages without dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 1dc6a0d66c Add a script in Scripts/developers_scripts thatcheck if there are differencies in the dependencies of packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno d577ee75a1 remove Build Dir from dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno 9fc057e1cf remove list and list generator for documented headers and make compute_dependencies implied by enable_check_header 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno 11a7f9720f get the list of documented headers at configuring time 2018-02-02 12:04:21 +01:00
Laurent Rineau 25c01d485c Merge pull request #2773 from maxGimeno/Mesh_IO-Fix_c3t3_plugin-GF
Polyhedron demo: Fix c3t3 IO plugin when used with TBB
2018-01-31 18:30:20 +01:00
Laurent Rineau 67f4ab82af Merge pull request #2723 from MaelRL/PMP-Graph_partition-GF
BGL Small feature: Graph partitioning
2018-01-31 18:29:59 +01:00
Maxime Gimeno f46e805c77 Make inherit the usage of TBB in the cmake macro 2018-01-30 14:09:47 +01:00
Laurent Rineau e8fca04385 Merge pull request #2691 from lrineau/Installation-fix_Boost_thread_required_or_not-GF
Installation: fix the detection of C++11 and the need for Boost Thread
2018-01-17 10:42:09 +01:00
Laurent Rineau e2f89318e5 Improve scripts 2018-01-11 16:52:35 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +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
jasjuang 374bd7e223 fix incorrect INTERFACE_INCLUDE_DIRECTORIES 2018-01-02 08:06:13 -08: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 02d7260dc1 Store the detection of C++11 in a CMake global property
That avoids to re-detecting it again and again.
2017-12-19 15:56:02 +01:00
Laurent Rineau e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-07 15:00:47 +01:00
Efi Fogel f1483cfa25 Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
Laurent Rineau 163a90b6c1 Fix `make install` in header-only
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +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 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +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
Laurent Rineau 5c7958dc08 Improve CGAL_target_use_TBB
The use of TBB by a target is private.
2017-11-30 11:12:11 +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 a2c513f080 QGLviewer depends on the lib GLU 2017-11-29 11:17:31 +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 0f63e872c1 Fix when Qt5 is not found 2017-11-28 10:28:50 +01:00
Laurent Rineau d44f144a90 Restore the missing file 2017-11-27 10:18:42 +01:00
Laurent Rineau 249aed9fd1 Hack for the CGAL test suite 2017-11-23 17:06:47 +01:00
Laurent Rineau ce9399d423 Display compiler and linker flags 2017-11-23 17:06:46 +01:00
Laurent Rineau 9eb2e30745 Deal with the macro CGAL_TEST_SUITE in header-only 2017-11-23 17:06:46 +01:00
Laurent Rineau a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Laurent Rineau c0ad644269 Correct syntax for target_compile_definitions 2017-11-23 16:41:21 +01:00