Commit Graph

879 Commits

Author SHA1 Message Date
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Laurent Rineau 8db4503904 Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix

# Conflicts:
#	Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
2020-06-03 16:22:55 +02:00
Maxime Gimeno 3356d066cc fix boost zlib targets 2020-06-02 15:31:55 +02:00
Laurent Rineau dc4427c998 Move the code in CGAL_SetupCGALDependencies.cmake 2020-05-28 12:44:25 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Dmitry Anisimov 69d174571a added the missing macros include 2020-05-25 11:25:01 +02:00
Laurent Rineau a56a052bca Merge pull request #4743 from AdrianBunk/CGAL-5.0-branch
Fix gcc option setting for Alpha
2020-05-22 10:35:56 +02:00
Adrian Bunk 5e70fceba9 Fix gcc option setting for Alpha 2020-05-22 11:21:58 +03:00
Simon Giraudot 5a95259849 Fix for cmake > 3.11 2020-05-18 13:40:31 +02:00
Laurent Rineau 81c1b96217 Merge branch 'releases/CGAL-5.0-branch' 2020-05-18 12:01:39 +02:00
Laurent Rineau 0ed0741489 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-18 11:59:20 +02:00
Laurent Rineau f12f6f5f08 Fix #4720 2020-05-13 21:22:07 +02:00
Laurent Rineau d30dfacf5f Fix the testsuite of test/Installation/ with CTest 2020-05-13 21:15:55 +02:00
Dmitry Anisimov 2ef4e362c1 integrated review for the fix 2020-05-11 11:29:54 +02:00
Laurent Rineau 4092727cf8 Fix CGAL_parse_version_h.cmake when the minor version is less than 10 2020-05-06 13:36:38 +02:00
Sebastien Loriot 0325219ce6
Merge pull request #4671 from maxGimeno/DGAL-Fix_MIN_MAX_issues-maxGimeno
CGAL: Min-max errors on windows
2020-04-27 09:46:04 +02:00
Sebastien Loriot e38f9c2195
Merge pull request #4633 from maxGimeno/Three-move_examples-maxGimeno
Three: Move examples to the Polyhedron_Demo
2020-04-22 13:20:32 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 3668a22d89 Update deprecation warnings 2020-04-15 14:06:13 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Simon Giraudot 41519e3010 Proposal for imported targets 2020-04-15 14:05:18 +02:00
Maxime Gimeno 55f7ed028c Add file to whitelist 2020-04-09 15:05:22 +02:00
Simon Giraudot 7cfe6df8e3 Allow classification package to be used without Boost IO Stream and Serialization 2020-04-07 11:02:16 +02:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Sebastien Loriot 0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno
CGAL 3D Demo: Enhancement of the Scene Saving System
2020-03-16 16:35:45 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Laurent Rineau 41316e25ef Protect MSVC specific compilation flags with $<COMPILE_LANGUAGE:CXX>
Fix issue #4571
2020-03-11 09:57:46 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Maxime Gimeno d8fd359399 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2020-02-24 16:41:34 +01:00
Simon Giraudot 00b1f51b24 Move find_package() to function to avoid polluting global cmake variables 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 97a8128f06 Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Laurent Rineau 84cd4ee1fa Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:32:07 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
Laurent Rineau c35c608021 Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:23:55 +01:00
Laurent Rineau 0019db6076 Fix a bug introduced in CGAL-5.0
When CGAL is configured in non-header-only, and then installed, then
CGAL_Qt5 does not work, with a CMake error. Reported in StackOverflow:

  https://stackoverflow.com/q/59596301/1728537
2020-01-10 12:34:58 +01:00
Laurent Rineau 8dec83dcf1
Update Installation/cmake/modules/FindOpenMesh.cmake
Fix my previous commit.
2020-01-08 09:55:22 +01:00
Maxime Gimeno 2be81f7965 Add a name in FindGLPK.cmake 2019-12-30 16:41:01 +01:00
Maxime Gimeno 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +01:00
Laurent Rineau 03ea31e562 Better FindOpenMesh.cmake, compatible with the upcoming OpenMesh 8.1 2019-12-17 16:03:54 +01:00
Laurent Rineau 3ec3e4e9d4 Fix FindOpenMesh.cmake
```
CMake Error at C:/CGAL/test/CGAL-5.1-Ic-33/cmake/modules/FindOpenMesh.cmake:54 (set_target_properties):
  Property INTERFACE_LINK_LIBRARIES may not contain link-type keyword
  "optimized".  The INTERFACE_LINK_LIBRARIES property may contain
  configuration-sensitive generator-expressions which may be used to specify
  per-configuration rules.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-33/BGL/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
2019-12-17 15:17:07 +01:00
Maxime Gimeno 64bce3fd90 Remove tehe option WITH_GMPXX completely 2019-12-13 16:31:34 +01:00