Commit Graph

515 Commits

Author SHA1 Message Date
Laurent Rineau 15d74af234 Bump the SONAME of libCGAL_Qt5.so
```
ABI changes between build CGAL-4.14-0.1beta2.fc30 and its latest stable build
================================================================================

This file contains possible ABI changes which have occurred due to this package update against latest stable build available in koji for the given Fedora release.

If you want to filter out these kind of ABI changes in the future, you can add a proper .abignore file to this package. To know more about how to write one, please look at the wiki page https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck#filtering .

On armv7hl architecture
*************************

* No ABI change between:
CGAL-devel-4.13-3.fc30.armv7hl.rpm
CGAL-devel-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.88 second(s).

* ABI changes found between:
CGAL-4.13-3.fc30.armv7hl.rpm
CGAL-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 11.54 second(s). Please review them.

================ changes of 'libCGAL_Qt5.so.13.0.2'===============
  Functions changes summary: 0 Removed, 1 Changed, 0 Added function
  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

  1 function with some indirect sub-type change:

    [C]'method CGAL::Qt::DemosMainWindow::DemosMainWindow(QWidget*, Qt::WindowFlags)' at DemosMainWindow_impl.h:62:1 has some indirect sub-type changes:
      return type changed:
        in pointed to type 'class CGAL::Qt::DemosMainWindow' at DemosMainWindow.h:52:1:
          type size changed from 544 to 608 (in bits)
          1 data member insertion:
            'QSettings CGAL::Qt::DemosMainWindow::settings', at offset 544 (in bits) at DemosMainWindow.h:129:1

================ end of changes of 'libCGAL_Qt5.so.13.0.2'===============

Removed binaries:
  /usr/lib/libCGAL_ImageIO.so.13.0.2, SONAME: libCGAL_ImageIO.so.13
Added binaries:
  /usr/lib/libCGAL_ImageIO.so.14.0.0, SONAME: libCGAL_ImageIO.so.14
* No ABI change between:
CGAL-demos-source-4.13-3.fc30.armv7hl.rpm
CGAL-demos-source-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.67 second(s).
```
https://taskotron.fedoraproject.org/artifacts/all/bfca5e3c-4aff-11e9-b891-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:31 +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
Laurent Rineau 8eee6f3e0c Allow to have different SOVERSION for each CGAL libraries
In CGAL-4.14, I would like to have `libCGAL.so.13` (to keep
compatibility), but `libCGAL_Image.so.14` (to break compatibility).
2019-02-28 14:26:02 +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 1cb63b5e78 Bump the SONAME 2018-12-17 15:21:59 +01:00
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
Laurent Rineau 39cb35b134 Avoid CMake errors with CMake<=3.4 2017-10-31 13:37:43 +01:00
Laurent Rineau a335b979f2 Include the file only once, in a all-CGAL build 2017-10-20 17:02:15 +02:00
Laurent Rineau 6fbfc14241 Merge pull request #2399 from lrineau/CGAL-ease_cross_compilation-GF
Ease the cross-compilation (to Android for example)
2017-09-07 17:20:24 +02:00
Laurent Rineau 08676e21fa Do not test the files config/testfiles/*.cpp while cross-compiling 2017-09-06 16:52:33 +02:00
Laurent Rineau e00851da24 Merge pull request #2357 from sloriot/CMake-install_var_relative
Make install paths relative as documented
2017-08-28 12:50:36 +02:00
Sébastien Loriot 156c374edb make install path relative as documented and not absolute 2017-08-22 10:20:49 +02:00
Laurent Rineau da4b2632c9 Prepare master for CGAL-4.12 2017-08-01 15:21:41 +02:00
Laurent Rineau 1b41c582ba Merge pull request #2306 from lrineau/Installation-fix_link_errors-GF
Fix link errors in the building of the Debian packages
2017-07-28 18:29:38 +02:00
Laurent Rineau 15fb0069cc Fix link errors in the building of the Debian packages
- The Debian package uses `-DCGAL_ENABLE_PRECONFIG=OFF` and
  `WITH_GMPXX=ON`. In that setup, GMPXX must in the "essential" 3rd
  party libraries.

- The CGAL_Core library must be linked with its
  dependencies (compilation error with `-zdefs`).
2017-07-26 16:57:19 +02:00
Laurent Rineau b6dc43f239 Prepare `master` for CGAL-4.11 2017-04-27 10:25:06 +02:00
Laurent Rineau 860e7c564f Fix errors detected by Travis
- What happens when VTK is missing...
- `clang++ -syntax-only` is more picky than g++
2017-04-14 18:11:43 +02:00
Laurent Rineau cf987b51ba Skip Three headers if QGLViewer is missing 2017-04-14 17:41:10 +02:00
Laurent Rineau 6493e66e72 Better use of CMP0057, to support CMake<3.3 2017-04-14 17:14:43 +02:00
Laurent Rineau f05ee0d890 Fix the detection of packages directories 2017-04-13 15:14:53 +02:00
Laurent Rineau e1e90924a8 Allow to configure/build all CGAL with step_2
If `CGAL_HEADER_ONLY_STEP_2` is `TRUE`, then a build of CGAL with
`WITH_demos`, `WITH_examples` will succeed.
2017-03-27 18:04:54 +02:00
Laurent Rineau bac7c694bc Restore the creation of <CGAL/compiled_config.h> 2017-03-27 18:04:52 +02:00
Laurent Rineau 70a6bf5ef9 CMake-2.8.12 is now required 2017-03-27 17:23:27 +02:00
Laurent Rineau 5725835fc3 Fix a bug
Do not add non-existent directories to `CGAL_INCLUDE_DIRS`.

CMake-3.5.2 complains about that in header-only.
2017-03-27 17:23:27 +02:00
Laurent Rineau ff15d0e5fc Simplify the CMakeLists.txt of our libraries 2017-03-27 17:23:26 +02:00
Sébastien Loriot eefa67f762 remove release_date.h and put the macro in version.h to be set by cmake
in the case of a release, it will be the date of the creation of the release
2017-01-19 16:32:31 +01:00
Laurent Rineau beb882981c Fix for CMake-2.8.11 and CMake-2.8.12 2016-10-06 18:18:50 +02:00
Laurent Rineau 420ba84b70 Deal with OpenMesh 2016-10-06 10:21:25 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 004dac6226 Merge pull request #1469 from lrineau/CGAL_ImageIO-better_read_raw-lrineau
better _readImage_raw()
2016-10-05 13:02:22 +02:00
Laurent Rineau bc03fae86c Add a whitelist
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
Laurent Rineau e4d19ff0eb Better output for dependencies
Now the output is in `BUILDIR/package_info/*/`.
2016-09-30 15:23:15 +02:00
Laurent Rineau 367da380f1 Move and regenerate list_of_documented_headers.cmake 2016-09-30 15:23:15 +02:00
Laurent Rineau c76eec40b9 Deal with the IPE, RS, and LEDA dependencies
For RS and LEDA, it seems it does not work correctly.
2016-09-30 15:23:14 +02:00
Laurent Rineau 7fe5258c7f Handle the dependencies
- QGLViewer
- Eigen3
- VTK
- Qt5 modules
2016-09-30 15:22:29 +02:00
Laurent Rineau c6855beb15 Only check the list of documented headers
That list of documented headers (contained in
`Installation/list_of_documented_headers.cmake`) is generated using a
shell script, with `ack`, by searching in the example .cpp files, and in
the Doxygen compiled documentation.
2016-09-30 15:22:28 +02:00
Andreas Fabri 867328fce5 Use CMAKE_CXX_FLAGS 2016-09-30 15:22:27 +02:00
Laurent Rineau ed680537c9 WIP: compute packages dependencies, using the compiler 2016-09-30 15:22:26 +02:00
Laurent Rineau 4707b2ed29 Merge pull request #1443 from TManhente/master
Adds CMake package version file generation
2016-09-23 16:52:13 +02:00
Laurent Rineau 37e138b252 CTest in branch builds 2016-09-20 10:53:20 +02:00
Laurent Rineau dc3c7a5c1c better _readImage_raw() 2016-09-16 17:07:13 +02: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 4a8602b49e Set CMP0056 if CMake>=3.2 2016-07-27 16:26:55 +02:00
Laurent Rineau 2cd9a15bb9 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
Merge the following merge commits:
> 12b92f5 Merge pull request #1271 from lrineau/Mesh_3-distance_criterion_sizing_field-GF
> 9c3d0b0 Merge pull request #1295 from lrineau/CGAL-add_test-GF

Conflicts:
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
2016-07-22 18:31:02 +02:00
Laurent Rineau c65d3abe17 Add support for CTest 2016-07-21 14:42:35 +02:00
Guillaume Damiand 46463202cb By default, CGAL_HEADER_ONLY is OFF. 2016-07-04 10:40:04 +02:00
Guillaume Damiand 4165a5a312 Replace the test on policy 0043 by a test on the cmake major version. 2016-06-28 12:18:07 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Sébastien Loriot c951fe0fca Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF
Fix -Wconversion warnings, and issues detected by those warnings
2016-06-24 13:30:48 +02:00
Guillaume Damiand d64f43ac73 The option CGAL_HEADER_ONLY is enabled only for cmake >= 3.0 (because in this case we use INTERFACE library) 2016-06-24 09:56:11 +02:00
Guillaume Damiand 6e92eafab7 Enable header only by default (for testing) 2016-06-05 20:49:48 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau a96ec65c54 Sort results of file(GLOB ...) to make build deterministic
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.

Fix #1048.
2016-05-06 16:50:16 +02:00
Laurent Rineau 810538d221 Fix 32bits issues in ImageIO
Those issues were detected by the compilation flag `-Wconversion` of
g++-5.3.

That changes the ABI of CGAL_ImageIO.
2016-04-22 12:35:32 +02:00
Laurent Rineau 617d5f2856 Merge pull request #843 from afabri/Random_print_seed-GF
Print the seed of CGAL::default_random
2016-04-01 11:02:54 +02:00
Laurent Rineau fd4e0a51cc Fix the SOVERSION
(Partially reverts commit 79f54a6c7c3af0a1aa1a6e845990fd06f950f63b.)
2016-03-29 12:10:37 +02:00
Laurent Rineau 03f4859026 Merge pull request #931 from marv/cmake-arch-indenpendent-files
Include GNUInstallDirs and use CMAKE_INSTALL_* variables
2016-03-24 13:16:59 +01:00
Laurent Rineau 5b48eedf20 Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
2016-03-24 11:30:14 +01:00
Laurent Rineau 79f54a6c7c Bump the SOVERSION_MINOR
- With the addition of that new function Random::Random(char*), the ABI
  changes, but in a compatible way -> bump the minor version of
  SOVERSION. The SONAME remains unchanged.

- Add tests for `Random` with and without `CGAL_TEST_SUITE`. That will
  make a difference only with header-only, because at the time the tests
  are compiled, libCGAL is already compiled.
2016-03-23 11:27:33 +01:00
Marvin Schmidt 887fade6d7 Include GNUInstallDirs and use CMAKE_INSTALL_* variables
This allows installing the architecture-independent data outside the
prefix. This is particularly necessary on systems using a
multi-architecture layout where architecture-dependent files live in
/usr/${host_triple}/ and architecture-independent files in /usr/share.
2016-03-19 16:44:22 +01:00
Laurent Rineau e98bc7ebb5 I have tried to run CGAL demos from 4.8 with 4.7 libs
I am surprised that the branch 'header-only, step 0' did not break the
ABI! Good job, guys.
2016-03-18 15:32:35 +01:00
Laurent Rineau fd42bc1d15 Step 2
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
Guillaume Damiand 700da4729b Remove install command removed in a previous commit and reintroduce here by a wrong resolved. 2016-03-09 12:50:18 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Guillaume Damiand 94f2565c6a Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY 2016-03-09 10:56:11 +01:00
Guillaume Damiand d56092753a Make enable_header_only option persistent 2016-03-09 10:35:21 +01:00
Guillaume Damiand f5baf48d5e Do not export cgal in header only mode 2016-03-09 10:32:32 +01:00
Guillaume Damiand 19c28de969 Add option to enable cgal header only. 2016-03-09 10:20:05 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Philipp Möller ecb34b3031 Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
Do not add it to Config.cmake files anymore and remove it from the
interface
2016-02-16 17:20:22 +01:00
Philipp Möller c72cc9fa8a Remove outdated variables 2016-02-16 17:02:56 +01:00
Philipp Möller 1a68a004c1 Split *Export.cmake files
Note that the build tree still uses a single CGALExports.cmake file,
while for each library a special export file is installed.
2016-02-16 17:02:56 +01:00
Philipp Möller 3b63763f5d Introduce CGAL_DOC_VERSION 2016-02-11 15:37:20 +01:00
Laurent Rineau aea00e0519 ./doc/ is not shipped in public tarballs 2016-02-10 18:54:59 +01:00
Andreas Fabri 1f0e8324a3 Fix the name of libraries, on Windows
If CGAL_FULL_VERSION is not set in the cache, in the sub-directory src/ its value is empty. That creates wrong  library names, on Windows, such as:
  libCGAL_ImageIO-vc120-mt-.lib
2016-01-12 12:15:52 +01:00
Philipp Möller 5349ee4dfc Move CGAL_FULL_VERSION to PARENT_SCOPE
This variable is more sensible to be used in documentation. The
corresponding set in non branch-build does not require a PARENT_SCOPE,
because it has no parent in the release layout.
2015-12-17 16:00:06 +01:00
Philipp Möller a66b5d5a09 Use doc/CMakeLists in a release 2015-12-10 17:05:51 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Philipp Möller dea9451c53 Move the add_config_flag macro to where it is used 2015-08-05 14:56:09 +02:00
Philipp Möller f0fad560f6 Remove unnecessary add_config_flag call
This call to add_config_flag has no effect. It is made before the
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h ...) which
overwrites the contents of the file.

This is surely a bug, because ${CGAL_EXT_LIB_${lib}_PREFIX} expands to
things like GMP or MPFR which would be really bad defines.
2015-08-05 14:56:09 +02:00
Philipp Möller e598d67ba6 CONFIG_CXX_FLAGS is no longer used 2015-08-05 14:56:09 +02:00
Philipp Möller de403e8cc4 Always run the config tests
The code tried to prevent running the config tests to often by caching
their values and only rerunning them when the CMAKE_CXX_FLAGS change.

While this is smart it only buys us a few seconds and is not actually
correct. One of those bugs could be triggered through linker flags or
debug flags as well and just checking CMAKE_CXX_FLAGS is far from
enough. To be on the safe side we accept the extra
configuration-time (which is usually also minimized by using compiler
caches).

This also removes a warning caused by CMake policy CMP0054.
2015-08-05 14:56:09 +02:00
Philipp Möller 8e5f887765 Prevent triggering of CMP0054
CMAKE_CXX_COMPILER_ID can expand to the string MSVC, which is also a
variable name which has been expanded by before CMP0054 has been
introduced.

This would lead to a bug *if* we would MATCHES against the string "MSVC",
but only triggers a warning.

Also quote some implicit string in a MATCHES for style reasons.
2015-08-05 14:56:08 +02:00
Philipp Möller 5cf0951577 Whitespace fixes 2015-08-05 14:56:08 +02:00
Philipp Möller 9b988404bf Set CMP0054 to NEW
We set it to new by removing the code that sets it to OLD.
2015-08-05 14:56:08 +02:00
Laurent Rineau a25705527e Merge pull request #212 from lrineau/Installation-CMP0054_OLD-GF
Remove the warning about CMP0054
2015-07-30 17:58:02 +02:00
Laurent Rineau a6b6105a7f Remove the warning about CMP0054
That is temporary.
2015-07-29 15:44:21 +02:00
Laurent Rineau e72e89971d Bump SOVERSION to 11.0.1 (no change) 2015-07-29 15:33:16 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
Maxime Gimeno a0e7a60973 Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
Conflicts:
	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
	Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
	Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
	GraphicsView/demo/Generator/CMakeLists.txt
	GraphicsView/demo/GraphicsView/CMakeLists.txt
	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
	GraphicsView/demo/Triangulation_2/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
	Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
	Surface_mesher/demo/Surface_mesher/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
Philipp Möller ba9cf09f03 Do not compute ${lib}_LIBRARY_INSTALLED anymore
CGALConfig_installed.cmake does not use that variable anymore
2015-06-29 16:36:50 +02:00
Philipp Möller f0082c20f4 To not check for the actual CMAKE_BUILD_TYPE
If CMAKE_BUILD_TYPE is not set in the initial run, is only
defined *after* this code is run. Since the build type is cached this
seemed to work when a cmake cache was already present, but not without.
2015-06-24 11:39:47 +02:00
Philipp Möller 3e0ce823ca Do not compute ${LIBRARY_NAME}_LIBRARY anymore
Fixes #47
2015-06-23 17:59:48 +02:00
Philipp Möller 8f7e338f33 Create a build-tree and installation export file
Add an export-name to libraries created with collect_cgal_library and
use it in install(EXPORT). Fake the behavior of export(EXPORT) by
looking for created targets manually.
2015-06-23 16:27:58 +02:00
Philipp Möller 1ce3c68ec8 Remove the -g flag in testsuites
While it might seem cleaner to simply add the -g0 argument, removing -g
is safer: -g0 would need to be added after any possible -g flags. Since
CMake makes no guarantees how the COMPILE_OPTIONS of a target are
actually initialized and we cannot change them on an individual basis
this is not easy to achieve. Hence we strip the CXX_FLAGS of -g. This
also still allows specifying it manually through CGAL_CXX_FLAGS.
2015-06-08 11:17:09 +02:00
Laurent Rineau cb385a771b Add -frounding-math for gcc 4 *and later*
Fix issue #104
2015-06-03 10:44:18 +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 52c4437539 This branch needs to bump the SONAME 2014-10-20 14:41:14 +02:00
Laurent Rineau 58e1779c1e Prepare future final release 4.5 2014-08-29 15:22:35 +02:00
Laurent Rineau 311b505cad Update the comment about the SOversion
Trivial fix for master
2014-08-18 15:35:17 +02:00
Laurent Rineau 926aa7500f Set CMP0042 to OLD
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
Laurent Rineau 4d468d1881 Add compatibility with CMake 3.0
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +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
Laurent Rineau ab9af1fda9 Nasty trick to make sure <gmp.h> is not used with CGAL_DISABLE_GMP 2014-06-26 19:12:30 +02:00
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +02:00
Sébastien Loriot 0230e979e2 Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
Conflicts:
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
	Documentation/doc/Installation.txt
	Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
Laurent Rineau e754509e2a Beginning of development of CGAL-4.5 2014-04-04 10:49:13 +02:00
Laurent Rineau 2c1f3332c9 SOVERSION for CGAL-4.4 2014-02-06 20:02:03 +01:00
Laurent Rineau c919a9f387 Follow-up to "Hide the variables CGAL_*_PACKAGE_DIR"
This is a followup-up to the following commit:
  | commit 16d42c0adf
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Tue Aug 20 15:47:00 2013 +0200
  |
  |     Hide the variables CGAL_*_PACKAGE_DIR
  |
  |     Those three variables are for internal use only, and should not be exposed
  |     to the users in the cmake cache:
  |       CGAL_INSTALLATION_PACKAGE_DIR
  |       CGAL_MAINTENANCE_PACKAGE_DIR
  |       CGAL_CORE_PACKAGE_DIR

Those variables are declared twice, in two 'if()'-branches. I forgot to
modify one copy of them.
2013-08-22 16:07:27 +02:00
Laurent Rineau f7d3eaab2a Remove a CMake warning when building from the release tarball
== Setting paths ==
-- Build CGAL from release in directory CGAL-4.3-beta1
CMake Warning (dev) at CMakeLists.txt:99 (set):
  Cannot set "CGAL_CONFIGURED_PACKAGES_NAMES": current scope has no parent.
This warning is for project developers.  Use -Wno-dev to suppress it.

The reason is that in the release there is not parent directory. As that
cmake instruction is need only if the Doxygen documentation is there, I
have surrounded the corresponding line of code by:
  if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/Documentation")
  endif()
2013-08-20 15:51:11 +02:00
Laurent Rineau 16d42c0adf Hide the variables CGAL_*_PACKAGE_DIR
Those three variables are for internal use only, and should not be exposed
to the users in the cmake cache:
  CGAL_INSTALLATION_PACKAGE_DIR
  CGAL_MAINTENANCE_PACKAGE_DIR
  CGAL_CORE_PACKAGE_DIR
2013-08-20 15:47:00 +02:00
Laurent Rineau 16cc269288 Change the SOVERSION to 10.0.2 2013-07-04 14:04:45 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries.
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
Philipp Möller 023e9714f3 Rescope CGAL_CONFIGURED_PACKAGES_NAMES
We need this variable in the Doxygen configuration process. Reset it
and change the scope to the parent scope.
2013-05-30 10:51:04 +02:00
Andreas Fabri 2edb2bdfe7 REMOVE_ITEM does not work with an empty list 2013-03-17 15:21:18 +01:00
Laurent Rineau d1d70fdce7 CGAL_DISABLE_GMP can be set in the environment variables 2013-03-15 18:24:16 +01:00
Laurent Rineau 92f464232a Allow to add CGAL_DISABLE_GMP lately in the cache 2013-03-15 16:39:59 +01:00
Andreas Fabri 02bb200fe5 Add a CMake variable that allows to disable GMP/MPFR 2013-03-15 14:11:34 +01:00
Laurent Rineau 23ee26c658 With MSVC, add flags /wd4503 and /bigobj by default
/wd4503 disables the warning C4503 "decorated name length exceeded"

/bigobj is sometimes required, and the only flaw is the incompatibility
with MSVS before MSVS 2005.
2013-03-01 18:33:09 +01:00
Laurent Rineau 316b09222e Keep the SONAME for CGAL-4.2, and bump the build number of SOVERSION. 2013-02-26 17:08:08 +01:00
Laurent Rineau 63212a0841 Revert "Bump CGAL SOVERSION to 11.0.0"
This reverts the following commit:
  | commit a6b340ccf7
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Feb 25 18:38:33 2013 +0100
  |
  |     Bump CGAL SOVERSION to 11.0.0
  |
2013-02-26 17:05:34 +01:00
Laurent Rineau a6b340ccf7 Bump CGAL SOVERSION to 11.0.0 2013-02-25 18:38:33 +01:00
Laurent Rineau c7179b2c6c Hide the CMake variable "WITH_tests" from the public releases
Trivial bug fix, that I have tested in both a public release and in a
branch build.
2013-02-22 13:20:25 +01:00
Philipp Möller 3d253a0edd Add CGAL_GIT_HASH and provide defaults for all variables 2012-11-15 13:20:37 +01:00
Eric Berberich 7937e731d8 removed svn part, and added dummy SVN_CREATED_SVN_REVISION to be 99999 2012-11-13 15:51:37 +01:00
Laurent Rineau ac76a86278 Do check only headers in the include/CGAL directory.
Not in sub-directories.
2012-10-10 12:25:39 +00:00
Laurent Rineau f0118a1311 Revert last commit (commited by error) 2012-10-09 09:28:37 +00:00
Laurent Rineau 648472bdac After a run of detect_packages_license 2012-10-09 09:26:23 +00:00
Laurent Rineau 7618e75092 Replace phony targets check_* by real targets
That way the check is not redone for file that already passed the check.
2012-10-05 12:58:58 +00:00
Laurent Rineau 0a081c2abd Add an option to check the syntax of headers, individually.
That feature can be enabled with g++, clang++, and icpc (intel). It could
be implemented for MSVC, with the flag /Zs, but that is not yet done (and
probably will not).

The option is controlled by a CMake option, CGAL_ENABLE_CHECK_HEADERS, that
is disabled by default. If that option is enabled by the user, then CMake
will check if the compiler $CXX understand the syntax:
  $CXX -x c++ -fsyntax-only CGAL/header.h
and send an error otherwise.

Then phony targets will be created:
  - a target check_CGAL__header_h for each header <CGAL/header.h>,
  - a target check_pkg_<pkg> for each package <pgk>,
  - and a target check_headers for the whole CGAL.

Those new targets currently give a lot of compilation errors if
CGAL_ENABLE_CHECK_HEADERS is enabled!

+ fix several missing includes in Mesh_2.
2012-10-05 12:21:44 +00:00
Eric Berberich b1481c43c8 ${lib} is now prefixed with name, which needed adaptions in loop
In addition: removed fake variable and thus simplified loop 
(needed to rename CGAL_INSTALLED_${lib}_LIBRARY to ${lib}_LIBRARY_INSTALLED)
2012-09-12 14:26:02 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
2012-08-22 12:35:03 +00:00
Eric Berberich 8948b57807 revert quick fix for a problem with CGAL_ENABLE_PRECONFIG
When preconfig was disabled, UseFiles were not correctly 
included because of a missing $ to indicate a variable
2012-08-22 09:05:31 +00:00
Laurent Rineau 33af7ab5dc Quick fix for CGAL_ENABLE_PRECONFIG: hide it
If CGAL_ENABLE_PRECONFIG is set to OFF, currently the CMake configuration
fails. That option is turned into an internal cache variable set to ON by
default.
2012-08-16 10:03:35 +00:00
Laurent Rineau 05d65ffeae Initial support for WITH_tests
That is only to compile tests, and not to launch a full testsuite!
2012-08-10 14:07:18 +00:00
Laurent Rineau b22a86c1c1 Fix the CGALConfig.cmake that is installed, on Windows 2012-08-03 15:38:26 +00:00
Laurent Rineau 9491693417 Fix an issue when BUILD_SHARED_LIBS is toggled
When the value of the Boolean cache variable BUILD_SHARED_LIBS is modified,
there was a bug that the variable CGAL_LIBRARY_NAME,
CGAL_Core_LIBRARY_NAME, CGAL_Qt4_LIBRARY_NAME, and so on, were not
updated. As a consequence, the file CGALConfig.cmake produced in the
installation directory was not correct: it was referring to .so files
whereas the installed binaries were .a files, or the reverse.

This patch fixes the issue.
2012-07-27 13:16:55 +00:00
Laurent Rineau a9cb96b42a Minor tweak to CMake messages during CGAL configuration
Before that patch, CGAL_SetupFlags was included in the stage:
  == Detect external libraries ==
Now there is a stage:
  == Set up flags ==
2012-07-26 10:51:05 +00:00
Eric Berberich 397f0e4131 worked only if WITH_CGAL_Core=ON|OFF, but not if it's not given at all 2012-07-05 09:03:18 +00:00
Laurent Rineau 1bb23e6b09 Cherry-pick hot fixes from CGAL-4.0-branch:
| ------------------------------------------------------------------------
  | r70257 | lrineau | 2012-07-04 10:41:28 +0200 (Wed, 04 Jul 2012) | 1 line
  | Changed paths:
  |    M /branches/releases/CGAL-4.0-branch/Installation/CMakeLists.txt
  | 
  | Fix CMake error in public releases
  | ------------------------------------------------------------------------
  | r70259 | lrineau | 2012-07-04 11:22:12 +0200 (Wed, 04 Jul 2012) | 1 line
  | Changed paths:
  |    M /branches/releases/CGAL-4.0-branch/Installation/CHANGES
  |    M /branches/releases/CGAL-4.0-branch/Installation/changes.html
  | 
  | Update the changes.html
  | ------------------------------------------------------------------------
2012-07-04 09:36:41 +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
Laurent Rineau 455fcb0109 Add a comment for later 2012-06-28 15:15:31 +00:00
Eric Berberich cccbcac26c ensure that CGAL_USE_CORE is only defined when WITH_CGAL_Core=ON
in particular when WITH_CGAL_Core=OFF is shall not be defined
2012-06-27 13:57:55 +00:00
Eric Berberich 67291a2c6d merge from next 2012-06-24 12:17:32 +00:00