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

1182 Commits

Author SHA1 Message Date
Marc Glisse e7357ac003 Merge remote-tracking branch 'cgal/master' into mt-glisse 
several PRs in Filtered_kernel conflicted with this :-(
 2021-07-19 14:53:27 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Dmitry Anisimov aaf55dbaa0 Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki 2021-06-18 14:45:24 +02:00
Dmitry Anisimov 94b75803c0
Merge branch 'master' into Solvers-add_osqp-danston 2021-06-18 10:02:11 +02:00
Laurent Rineau 530616534a Fix and document the CMake CGAL_HAS_NO_THREADS option 2021-06-16 17:12:59 +02:00
Laurent Rineau f0ba5bc7c6 Merge pull request #5768 from alefy/CMake-Fix_OpenMesh-alefy 
Set CMake imported OpenMesh library as INTERFACE
 2021-06-16 15:04:48 +02:00
Laurent Rineau 94d1be2a79 Merge pull request #5768 from alefy/CMake-Fix_OpenMesh-alefy 
Set CMake imported OpenMesh library as INTERFACE
 2021-06-16 15:03:42 +02:00
Laurent Rineau aa6dbfe4f2 Make CGAL unconditionally depend on Threads::Threads 2021-06-15 12:56:25 +02:00
Adrien Lefieux b6a34b2bc5 Set CMake imported OpenMesh library as INTERFACE 2021-06-08 16:53:13 +02:00
Laurent Rineau b935f4daa6 Merge pull request #5732 from janetournois/Polyhedron_demo-fix_cmakelists_find_tbb-jtournois 
FindTBB.cmake: only search TBB in Config mode if version >= 2019 update 5
 2021-06-02 17:21:05 +02:00
Laurent Rineau 5cbadbede6 Merge pull request #5701 from maxGimeno/Ctest-Adapt_scripts_to_windows-maxGimeno 
Testsuite: Adapt ctest scripts for use with cygwin
 2021-06-02 17:20:49 +02:00
Laurent Rineau d99fa2517e Merge branch '5.1.x-branch' into 5.2.x-branch 2021-06-02 17:19:45 +02:00
Dmitry Anisimov 267a6412ac initial commit with the new osqp solver concept 2021-05-31 14:01:08 +02:00
Jane Tournois 321e8293af
fix outdated code 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-05-28 14:55:14 +02:00
Jane Tournois 525271c25e start by looking for TBB_ROOT (env or cmake variable) and TBB_DIR (cmake variable) 
and fix 2019 Update 5 version number
 2021-05-28 12:20:37 +02:00
Jane Tournois 8d4f14735b workaround a bug of earlier versions of TBB 
Laurent said :
"That is a bug in earlier versions of TBB. It was fixed in TBB 2019 update 5. That is a bad interaction with #5687, that made the module FindTBB.cmake from CGAL search for TBB in Config mode, first."
 2021-05-27 15:06:56 +01:00
Maxime Gimeno 0e9d4bf956 Fixes in CMake 2021-05-20 12:17:48 +02:00
Laurent Rineau 10efadb510 Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno 
First search for TBB in config mode
 2021-05-18 17:32:11 +02:00
Laurent Rineau e25c58d180 Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno 
First search for TBB in config mode
 2021-05-18 17:06:56 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno b61f458cff USe the command 2021-05-11 14:56:16 +02:00
Maxime Gimeno 827a5ae8aa review 2021-05-11 14:40:40 +02:00
Maxime Gimeno 889119e800 Update add_test to directly use msbuild when running on cygwin 2021-05-11 12:48:44 +02:00
Maxime Gimeno 74b3504879 First search for TBB in config mode 2021-05-06 14:41:08 +02:00
Dmitry Anisimov 3c0fc281e8 more optimizations, using boost any and factoring out kd tree, adding metis check 2021-05-05 13:17:23 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Laurent Rineau a6a16d14ab Fix the bug on Windows 2021-04-08 17:53:41 +02:00
Laurent Rineau 8dc3256685 Merge pull request #5488 from sgiraudot/Classification-Remove_TensorFlow_support-GF 
[Small Feature] Remove TensorFlow support
 2021-04-06 15:13:15 +02:00
Maxime Gimeno e5bf52d9c6 fix indentation and remove GMP_LIBRARIES_DIR 2021-04-02 14:56:50 +02:00
Maxime Gimeno 9a4d495567 don't use generator expression 2021-04-02 14:47:46 +02:00
Maxime Gimeno c5ebd7c88e dichotomize multiconfig generators 2021-04-02 14:30:02 +02:00
Maxime Gimeno 16ee70bb12 Use a generator expression to determine the lib to use 2021-04-02 14:11:23 +02:00
Maxime Gimeno 87bb3b27d1 Split GMP_LIBRARIES into debug and release. 2021-04-02 12:56:05 +02:00
Guillaume Damiand 751fb3851d
Merge branch 'master' into CGAL_data-gdamiand 2021-03-19 13:47:37 +01:00
Guillaume Damiand d140e5b89d Add CGAL::Data target; link exe with this target in the create_single_source_cgal_program function. 2021-03-19 13:45:04 +01:00
Sébastien Loriot 887b7d0eaa add METIS cmake support file 2021-03-18 14:58:04 +01:00
Sébastien Loriot ac15312260 add Ceres support cmake file 2021-03-18 14:47:56 +01:00
Simon Giraudot 8264096ee7 Remove TensorFlow support from Classification 2021-02-23 08:52:02 +01:00
Laurent Rineau 7edf0f2458 Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno 
PSP_3: Fix pointmatcher support
 2021-02-18 15:26:22 +01:00
Laurent Rineau fa1a355751 Merge branch '5.1.x-branch' into 5.2.x-branch 2021-02-18 15:19:05 +01:00
Laurent Rineau 7d760d8a72 Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno 
PSP_3: Fix pointmatcher support
 2021-02-18 15:18:08 +01:00
Sebastien Loriot 913d6a608d
Update Installation/cmake/modules/CGALConfig_binary.cmake.in 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-02-12 10:10:17 +01:00
Sébastien Loriot 6e3828f10c add in .in files 2021-02-12 08:44:14 +01:00
Sébastien Loriot 3cefeeb23c set CGAL_DATA_DIR in CGALconfig.cmake 2021-02-11 19:18:57 +01:00
Maxime Gimeno 08ea69f57c More remaining xml 2021-02-10 13:43:25 +01:00
Laurent Rineau 7d526225af Merge pull request #5388 from maxGimeno/Ipeets-Fix_after_merge-maxGimeno 
CGAL_Ipelets: Fix after merge in master.
 2021-02-05 16:10:15 +01:00
Sébastien Loriot a7ed934523 add missing quotes 2021-02-04 11:53:19 +01:00
Sébastien Loriot 6197135ba8 set CGAL_DATA_DIR for ctest and cmd files 2021-02-04 11:10:48 +01:00
Maxime Gimeno 89d199616b Remove remaining not header_only code 2021-01-29 15:56:13 +01:00
Maxime Gimeno 4ed3b0129c make the dependencies to boost general, not just for windows 2021-01-25 15:35:27 +01:00
Maxime GIMENO c5da5251b1
Update Installation/cmake/modules/FindIPE.cmake 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-01-25 14:54:00 +01:00
Maxime Gimeno 01374debeb Drop Ipe 6 support 2021-01-25 13:39:36 +01:00
Laurent Rineau ca9febf3b8 Merge pull request #5063 from maxGimeno/CMake-modernization-maxGimeno 
CMake modernization

# Conflicts:
#	CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
 2021-01-22 15:25:54 +01:00
Maxime Gimeno 9ac0a1de04 Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-18 11:52:30 +01:00
Maxime Gimeno 99a31e07fe Move the Boost components in the support file and condition it to windows. 2021-01-15 14:07:17 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Maxime Gimeno fa22cd972b Change libpointmatcher_support so it won't fail when old boost has been used to build pointmatcher. 2021-01-14 13:58:15 +01:00
Maxime Gimeno 2255f8e8ea Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-13 14:34:09 +01:00
Maxime Gimeno 232327c81c Set LAS as system headers to skip warnings in testsuite 2021-01-11 09:55:30 +01:00
Laurent Rineau d6f76d4f87 Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno 
CI: Add Checks in GitHub Actions
 2021-01-06 16:11:08 +01:00
Laurent Rineau fee181b6eb Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno 
CI: Add Checks in GitHub Actions
 2021-01-06 16:04:47 +01:00
Maxime Gimeno fc4fc891e7 Fix dependencies 2020-12-29 14:33:49 +01:00
Maxime Gimeno f6874b2d31 Add checks for pushes 2020-12-29 14:33:29 +01:00
Laurent Rineau 41211e308b Merge branch '5.1.x-branch' 2020-10-28 09:52:34 +01:00
Laurent Rineau 6007fe7c04 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-28 09:51:02 +01:00
Laurent Rineau 27d585438b Support non-header-only 2020-10-27 09:16:53 +01:00
Laurent Rineau 14f27a2b41 Fix CTest issues with CGAL_Qt5 
Add a target `compilation_of__CGAL_Qt5_moc_and_resources`, and a
corresponding CTest test, so that `CGAL_Qt5_moc_and_resources` is
always compiled first, when needed. That will fix CTest
race-conditions, where `CGAL_Qt5_moc_and_resources` was being compiled
by several CTest test at the same time.
 2020-10-26 13:52:33 +01:00
Maxime Gimeno 7bdc5d11a9 Post-review 2020-10-15 15:03:20 +02:00
Maxime Gimeno fcb6419106 WIP CGAL_qt5 2020-10-13 15:36:44 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Maxime Gimeno 0f46df37df Restore GLOB 2020-10-12 11:11:04 +02:00
Maxime Gimeno fb39fc71ac Revert most changes to the cgal_use_file 2020-10-09 12:55:25 +02:00
Maxime Gimeno af5d1ee535 fix list 2020-10-09 11:16:23 +02:00
Maxime Gimeno fe75ee4ee6 restore CMP0077 2020-10-08 13:42:42 +02:00
Maxime Gimeno 221bbdd4b1 remove CMP code now that we only support from cmake 3.13 2020-10-08 12:31:41 +02:00
Maxime Gimeno 733c487cc2 Fix file(GLOB...) in Installation/CMakeLists 2020-10-08 11:01:18 +02:00
Maxime Gimeno 616574e5ab Modernize CMake scripts 2020-10-06 15:44:41 +02:00
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +02:00
Maxime Gimeno fa2e8ec0a4 remove WITH_XXX cache options 2020-10-05 15:19:55 +02:00
Maxime Gimeno 27589e4b26 Remove preconfigured 3rd party libs options 2020-10-05 14:37:38 +02:00
Sebastien Loriot af260a3156
Merge pull request #4869 from maxGimeno/CGAL-CMake_testsuite-maxGimeno 
Add a testsuite for CMake
 2020-10-02 15:21:47 +02:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF 
Add ITT support in Mesh_3
 2020-10-02 15:20:04 +02:00
Maxime Gimeno 1be84a948f Copy resource files when building the demo from installation 2020-09-30 12:03:05 +02:00
Laurent Rineau c788d66761 Merge pull request #4860 from lrineau/CGAL-CGALConfigVersion__fixes-GF 
CGALConfigVersion... fix #4850
 2020-07-23 17:15:09 +02:00
Laurent Rineau c98978a62f Merge pull request #4864 from lrineau/CGAL_Core-fix_memory_pool_issue-GF 
CGAL_Core: fix a long-standing bug ( !blocks.empty() )
 2020-07-23 17:15:07 +02:00
Laurent Rineau f2da5cdb1a Merge pull request #4859 from sgiraudot/Installation-Fix_cmake_module_IO_streams-GF 
Fix CMake module for Boost IO Streams
 2020-07-22 16:54:39 +02:00
Laurent Rineau 5ae732d241 Trivial fix: MPFI needs MPFR 2020-07-22 10:23:30 +02:00
Laurent Rineau 8a7d3fa21e CGAL_Core no longer needs Boost.Thread 2020-07-21 17:32:30 +02:00
Laurent Rineau 022b1a71d0 Merge branch 'releases/CGAL-5.0-branch' 2020-07-21 15:27:49 +02:00
Laurent Rineau 2e8a59d570 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-21 15:25:54 +02:00
Laurent Rineau 80daf54be1 Remove leading zeros in CGAL_BUILD_VERSION: 1 instead of 001 2020-07-21 11:23:22 +02:00
Simon Giraudot bb4fda240c Fix INTERFACE_LINK_LIBARIES which should be a semicolon-separated string 2020-07-21 11:02:45 +02:00
Maxime Gimeno 26c28abe68 Add a fake function for cgal_add_compilation_test 2020-07-20 09:55:54 +02:00
Laurent Rineau 2e912d4cb2 Merge branch 'master' into Mesh_3-ITT_support-GF 2020-07-08 16:22:58 +02:00
Laurent Rineau abd53906c5 Remove trailing whitespaces 2020-07-02 15:51:29 +02:00
Laurent Rineau 80dd558884 Display the compiler version in test results 
I commit directly to `master`, because there is no way to test that in
`integration`.
 2020-07-02 15:50:49 +02:00
Laurent Rineau 4d3cd32176 Fix Travis error about a non-UTF8 character 2020-06-12 10:24:37 +02:00
Laurent Rineau 25710329ac Add ITT support in Mesh_3 2020-06-11 14:56:04 +02:00
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
Laurent Rineau 4354b2c87f Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston 
boost mp on Apple clang issue fix
 2020-06-03 16:21:28 +02:00
Laurent Rineau 4dba18fe9d Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston 
boost mp on Apple clang issue fix
 2020-06-03 16:11:23 +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
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Laurent Rineau bc735b44a0 Check the presence of <CGAL/Qt/*.h> header 
When CGAL is installed by package-managers, CGAL_Qt5 headers maybe
installed separately:
  - `libcgal-qt5-dev` on Debian,
  - `CGAL-qt5-devel` on Fedora, for example.
 2019-10-31 13:49:22 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0$/SPDX-License-Identifier: GPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0$/SPDX-License-Identifier: LGPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0$/SPDX-License-Identifier: LGPL-2.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
 2019-10-18 22:08:05 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Laurent Rineau 5ad86b83c6 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-16 18:04:33 +02:00
Laurent Rineau ac1b7ec61a Fix CGAL_Qt5 in non-header-only 2019-10-16 18:02:26 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-15 16:34:09 +02:00
Laurent Rineau e496a5e679 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF 
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components

# Conflicts:
#	Scripts/scripts/cgal_create_CMakeLists
 2019-10-15 16:33:17 +02:00
Laurent Rineau 13bd01d38c Fix when CGAL_Qt5 is not available 2019-10-15 09:16:26 +02:00
Laurent Rineau 24a099afc6 Fix CGAL_Qt5 in non-header-only 2019-10-14 11:24:13 +02:00
Laurent Rineau ac557caa4a Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others 2019-10-10 12:23:42 +02:00
Maxime Gimeno 60d3851a20 Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal 2019-10-03 13:35:35 +02:00
Laurent Rineau 030b4cf3a4 Whitelist more headers from Three 
Without the uic-generated header, they cannot compile.
 2019-10-02 11:31:45 +02:00
Laurent Rineau 779ef144fe Do not require -DCGAL_HEADER_ONLY 
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
 2019-10-01 18:10:30 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis/install.sh
 2019-09-27 16:24:41 +02:00
Laurent Rineau a28d1554b3
FindTBB.cmake: read both TBBROOT and TBB_ROOT (#4252) 
FindTBB.cmake: read both TBBROOT and TBB_ROOT
 2019-09-27 16:17:28 +02:00
Maxime Gimeno 718421b2b9 Add a line in the Supported Compilers about MSVC and CMake 2019-09-27 15:55:25 +02:00
Maxime Gimeno 58b647a1c1 Fix CGAL_TOOLSET for latest visual compilers. 2019-09-27 14:48:53 +02:00
Laurent Rineau 7e36ab1848 FindTBB.cmake: read both TBBROOT and TBB_ROOT 
Fix #4240
 2019-09-26 15:52:20 +02:00
Maxime Gimeno b1a8ec6d76 Add a way to upload a scene through ssh. 2019-09-26 14:57:22 +02:00
Laurent Rineau df99307140 Merge branch 'releases/CGAL-4.14-branch' 2019-09-09 16:48:23 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau 2a5b7cd7ba Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF 
Fix CTest on windows
 2019-09-05 14:59:38 +02:00
Laurent Rineau b8c7cb21bd Add a hook to track targets without dependent 2019-09-04 14:18:12 +02:00
Laurent Rineau f45c16f815 Add a new custom target ALL_CGAL_TARGETS to track all targets 
That will include also targets with `EXCLUDE_FROM_ALL`.
 2019-09-04 14:18:12 +02:00
Maxime Gimeno ba9adf4aa9 Fix typo 2019-08-16 13:08:00 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Maxime Gimeno 69e5072cc1 Get rid of the two fake lines in ctest_testsuite 2019-07-29 13:35:19 +02:00
Laurent Rineau 7b1889b87e Merge branch 'releases/CGAL-4.14-branch' 
# Conflicts:
#	Point_set_processing_3/include/CGAL/IO/write_ply_points.h
 2019-07-26 18:45:17 +02:00
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 fbf163d244 Fix when CGAL_USE_FILE is not included 2019-07-25 16:13:08 +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
Maxime Gimeno 82567685ad Add include of CGAL_taret_use_TBB in the end of the new FindTBB 2019-07-19 09:34:12 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Maxime Gimeno 7f604308d0 Update FindTBB.cmake 2019-07-15 12:45:28 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF 
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
 2019-07-10 14:22:53 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand 
CGAL: more viewers
 2019-07-10 14:22:50 +02:00
Laurent Rineau dee111bec5 Improve FindOpenMesh by adding an imported target 2019-07-05 10:35:56 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Laurent Rineau 5341998c7e Add a new ctest fixture, that checks the build system 
That will avoid that `cmake` is run in parallel several times, when
`ctest -j` is used.
 2019-06-28 12:53:53 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Laurent Rineau 1bcaf6bbf3 Fix in non-header-only: one has to call find_package(Boost) 2019-06-20 11:57:37 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Liangliang Nan 010f05dfeb find GLPK 
- added FindGLPK.cmake
- try to find SCIP first. If not, try to find GLPK
 2019-06-19 15:02:27 +02:00
Laurent Rineau e260ea1dd4 C++11: remove the need for Boost.Thread, even with CGAL_Core 2019-06-18 15:06:23 +02:00
Liangliang Nan 92add3db18 Update list_of_whitelisted_headers.cmake 
added
CGAL/SCIP_mixed_integer_program_traits.h
and
CGAL/GLPK_mixed_integer_program_traits.h
 2019-06-12 21:21:55 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Laurent Rineau 5dc823d509 Merge branch 'releases/CGAL-4.14-branch' 2019-05-23 08:49:56 +02:00
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Laurent Rineau 357fe1e486 Fix CTest CGAL tests when binary dir is a sub-directory 
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
 2019-05-20 12:18:18 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau 
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
 2019-05-14 16:18:24 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +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 aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF 
Adapt to Boost 1.70
 2019-05-07 15:45:00 +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 91d7fd4cb2 CGAL_TweakFindBoost must be included first 2019-05-06 16:34:07 +02:00
Laurent Rineau 212a088c5e That variable CGAL_TweakFindBoost was useless if not set 2019-05-06 16:33:42 +02:00
Laurent Rineau d8e23fefd2 CGAL requires CMake 3.1, that know about Boost 1.56 or before 2019-05-06 16:33:01 +02:00
Laurent Rineau 623fd4f10f If BUILD_SHARED_LIBS is not defined, use Boost shared libs 2019-05-03 18:39:30 +02:00
Laurent Rineau 7812d1b810 Boost: link with imported targets, if they exist 2019-04-29 16:36:04 +02:00
Laurent Rineau 3cb372be34 Do not search for Boost thread when not needed 2019-04-29 15:24:51 +02:00
Laurent Rineau af52b353d2 Boost 1.70 uses the CMake Config mode, now 2019-04-26 17:12:54 +02:00
Laurent Rineau a9fd0a3729 Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++ 
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
 2019-04-26 17:12:01 +02:00
Laurent Rineau 6615d1d12d Change the default value of CGAL_Boost_USE_STATIC_LIBS 
It is now related to `BUILD_SHARED_LIBS`.
 2019-04-26 17:11:24 +02:00
Laurent Rineau 36dba385a0 Add a bunch of new Boost versions 2019-04-26 17:10:49 +02:00
Laurent Rineau f3bc713103 Typo in a comment 2019-04-26 17:10:35 +02:00
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