Commit Graph

188 Commits

Author SHA1 Message Date
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
Eric Berberich 7973423691 prefix is a variable 2012-06-21 14:54:17 +00:00
Sébastien Loriot d67be721d4 write prefix exception into config file and use default one otherwise for find_package 2012-06-21 14:27:35 +00:00
Laurent Rineau 0aba4d0010 Fix the parsing of the VERSION file
In case of a build from a release tarball, the parsing of the VERSION file
was not correct. This patch tries a better solution.
2012-06-21 10:34:46 +00:00
Eric Berberich 3fde316a6c added CGAL_ENABLE_PRECONFIG (the default value has to be determined) 2012-06-20 11:16:17 +00:00
Eric Berberich 7a9557e414 fixed typo 2012-06-19 11:41:10 +00:00
Eric Berberich ed88f4e0e2 added comments 2012-06-19 08:26:16 +00:00
Eric Berberich 70fbefe00f fix for QGLViewer or QGLVIEWER (AHHHHHH!) 2012-06-14 16:56:36 +00:00
Eric Berberich 90e6f6bf0f fix for ZLIB 2012-06-12 12:45:17 +00:00
Eric Berberich 35f5e9fa65 now Eigen3 is working (ahhh case-sensitive lib configuration ahhhh) 2012-05-29 15:18:01 +00:00
Eric Berberich 10d8114ed3 fix for Eigen 2012-05-28 08:05:24 +00:00
Eric Berberich 76ef5030ff fix for Eigen3 2012-05-25 15:46:37 +00:00
Sébastien Loriot 41d3549414 typo LIRARIES->LIBRARIES 2012-05-25 11:10:54 +00:00
Eric Berberich c9a1a5cbd3 added Eigen3 2012-05-24 08:44:45 +00:00
Eric Berberich 333bd56995 add lang C to main file 2012-05-24 08:28:00 +00:00
Sébastien Loriot ab88be4751 clean up printed message to make it more consistent 2012-05-21 11:26:10 +00:00
Eric Berberich 60efbec2d3 merge from next 2012-05-20 11:50:30 +00:00
Laurent Rineau 5d3bd1094c In the testsuite, once the reference cache is loaded, unset some nasty
variables, such as eg. CGAL_Qt4_BINARY_DIR.
2012-04-13 07:55:43 +00:00
Laurent Rineau 69208fc8f2 Increase the SOVERSION for CGAL-4.1 2012-03-12 16:20:14 +00:00
Laurent Rineau c2ab0cf770 Bug fix: WITH_CGAL_Core was ignored
There was an explicit 
  unset(WITH_CGAL_Core)
in the CMake scripts of CGAL. It was introduced to workaround an issue in
our testsuite process. I turned it into an EXCLUDE WITH_CGAL_Core in the
command load_cache that is used by our testsuite process.
2012-02-10 15:32:38 +00:00
Laurent Rineau ca9ddf0ca5 CGAL_BUGFIX_VERSION must not be empty (for the rc file on Windows)
When CGAL_BUGFIX_VERSION is empty, sets it to 0.
2012-02-07 16:51:38 +00:00
Laurent Rineau d38da06a26 Fix that patch:
| ------------------------------------------------------------------------
  | r67597 | lrineau | 2012-02-03 18:13:17 +0100 (Fri, 03 Feb 2012) | 1 line
  | 
  | Do not install scripts/cgal_create_assertions.sh scripts/cgal_create_cmake_script_with_options
  | ------------------------------------------------------------------------
Use full-path for scripts.
2012-02-07 13:15:23 +00:00
Laurent Rineau df25f0aa17 Fix (examples|demo)/CMakeLists.txt
That way, those CMakeLists.txt can be used to build examples and demo from
outside the building of CGAL libraries.
2012-02-06 11:39:40 +00:00
Laurent Rineau 058dbe631d Do not install scripts/cgal_create_assertions.sh scripts/cgal_create_cmake_script_with_options 2012-02-03 17:13:17 +00:00
Laurent Rineau 7b2e34d267 merge with next 2012-01-27 16:46:42 +00:00
Laurent Rineau 4aafb6172c Fix cmake_minimum_required()
Yesterday's patch was plainly wrong. I want CMake-2.8.6 on Windows, and
only CMake-2.6.x on Linux.
2012-01-27 14:48:23 +00:00
Laurent Rineau c81dd1c3c3 Require CMake>=2.8.6 on Windows platforms 2012-01-26 10:17:17 +00:00