Commit Graph

360 Commits

Author SHA1 Message Date
Laurent Rineau 007a70e7cc Merge branch 'releases/CGAL-4.12-branch' 2018-05-29 17:19:52 +02:00
Laurent Rineau 01574e7ab9 Partially revert 7cc46441b5
Partially revert 7cc46441b5 from the PR
https://github.com/CGAL/cgal/pull/3021

We want to override CGALConfig.cmake. The previous patch was wrong. That is
easier to forbid in-source builds in Git, anyway.
2018-05-28 15:22:19 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 13:58:19 +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 d7d39e9036 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 11:00:39 +02:00
Laurent Rineau e4ff486963 Merge pull request #3110 from lrineau/Installation-better_check_headers-lrineau
Installation: better check_headers (for Travis)
2018-05-25 10:42:22 +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 11d310bba0 Fix typo falg/flag 2018-05-23 15:09:53 +02:00
Maxime Gimeno 853bd3ceed Add a step to check_headers that tries to build a dummy cpp with all the checked headers. 2018-05-23 11:48:57 +02:00
Laurent Rineau cd79383d5b Fix `make install` with the tarball and header-only 2018-05-22 14:45:04 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +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 160d36af18 Fix `make install` in header-only 2018-04-16 12:08:33 +02:00
Laurent Rineau 7cc46441b5 Do not overwrite source files!
Fixes #3016.

Now the `CGALConfig.cmake` at the root of the Git repository is not
modified, even with an in-source configuration.
2018-04-13 11:28:17 +02: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 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 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 c27f2a209d Rename changes.md to CHANGES.md 2018-03-05 11:26:06 +01:00
Laurent Rineau 0140fbd94d Merge pull request #2830 from maxGimeno/CHECK_HEADER-Add_a_flag
CGAL_ENABLE_CHECK_HEADERS implies CGAL_PROFILE
2018-02-23 17:26:08 +01:00
Laurent Rineau 6553d7a9b3 Fix check_headers in master 2018-02-20 10:59:04 +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 72aab1189a Add the CMake option CGAL_HEADER_ONLY
This was already a CMake cache variable that is used a lot, but it was not
yet visible in the CMake GUI.
2018-02-15 15:51:27 +01:00
Maxime Gimeno a3409eb829 Change to compile flag 2018-02-14 11:04:08 +01:00
Maxime Gimeno cb5bf32f09 Add -DCGAL_PROFILE if CGAL_ENEABLE_CHECK_HEADERS is ON. 2018-02-14 10:26:03 +01:00
Andreas Fabri abe933a684 Address the warning concerning SCL_SECURE for VC++ 2018-02-09 15:00:14 +00:00
Laurent Rineau 69ca424c5e Add CGAL_DEV_MODE 2018-02-06 15:08:54 +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 a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 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 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 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
jasjuang aafe1a7bea fix sudo make install because of incorrect file name 2017-11-24 19:03:44 -08: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 a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Laurent Rineau 8a260c4c32 Remove CGAL setup flags
@afabri This commit removes our tricks with the compilation flags.
2017-11-17 12:57:12 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Laurent Rineau 7cff890473 Change the installation of CGALConfig.cmake 2017-11-15 14:45:23 +01:00
Laurent Rineau e17736a9d9 Change the default INSTALL_CMAKE_DIR 2017-11-15 14:30:43 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +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
Clement Jamin abd9616231 Hide the CMake option we added for "step 1" 2017-11-13 10:09:22 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00