Commit Graph

214 Commits

Author SHA1 Message Date
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
Eric Berberich 5ed099f6c1 enable preconfig 2012-06-21 21:57:16 +00:00