A warning of clang showed me my mistake:
In file included from /no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/cmake/platforms/x86-64_Linux-Fedora18_llvm-clang-with-g++-4.7/test/Kinetic_data_structures/timings.cpp:14:
In file included from /no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/Kinetic/Delaunay_triangulation_3.h:32:
In file included from /no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/Delaunay_triangulation_3.h:31:
In file included from /no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/Triangulation_3.h:37:
/no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/Triangulation_data_structure_3.h:938:7: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
CGAL_assume(index_v_in_n0 <= 1);
^ ~~
/no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/assertions.h:86:29: note: expanded from macro 'CGAL_assume'
# define CGAL_assume(EX) CGAL_ASSUME(EX)
^
/no-raid/home/lrineau/CGAL/CGAL-4.4-I-10/include/CGAL/config.h:334:30: note: expanded from macro 'CGAL_ASSUME'
# define CGAL_ASSUME(EX) if(!EX) { __builtin_unreachable(); }
^
Trivial bug-fix.
Compact_mesh_cell_base_3 has a different API than Mesh_cell_base_3. Unless
one uses the default template parameters, the new API is less
convenient. We cannot deprecate Mesh_cell_base_3 so easily.
This leads to false positives
(cherry picked from commit a5d9d001aa995c4a66d73a40cbc6a1a22b795d4d)
Message added by Laurent Rineau:
that commit was tested in CGAL-4.3-Ic-168
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.
== 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()
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
That is a late follow-up to the following commit:
| commit 12744ab7ff
| Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
| Date: Thu Apr 28 13:11:09 2011 +0000
|
| Track dependencies between libraries and examples/demos
|
| With this patch, when CGAL as been configured with WITH_examples and/or
| WITH_demos, then the executables of examples and demos depends on the CGAL
| libraries. That means if one change a file involved in a CGAL library, and
| ask the rebuild of an executable, then the CGAL library will be rebuilt
| first.
|
| Notes:
| r63187 branches/next
Or maybe the bug was re-introduced by recent modifications of our CMake
scripts.
If the debug versions are not found, the release versions will be used instead
for the debug mode.
If the tbb_malloc library is not found, doesn't link with it.
- Untabified
- Does not link with the TBB mallow proxy anymore, but set
TBB_MALLOCPROXY_DEBUG_LIBRARY and TBB_MALLOCPROXY_RELEASE_LIBRARY
so that a user can still link with it if necessary
Note: the malloc proxy is not available on MacOS.
- Calls include_directories ( ${TBB_INCLUDE_DIRS} ) and
link_directories( ${TBB_LIBRARY_DIRS} ) to set paths
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
related to this small-feature:
Features/Small_Features/Property_maps_change_of_key_type
Successfully tested in CGAL-4.3-Ic-59 and approved by the release manager
Conflicts:
Installation/changes.html
the primitive container was clear before deleting the nodes
(which was not done since the container was empty)
At the same time I made the delete of the KD-tree done only
if it was constructed
The CMake module FindBoost.cmake searchs for Boost first in the "Config
mode" of 'find_package'. That allows to find installation of boost-cmake
(that is Boost configured using CMake). That configuration of Boost is
rather rare. But the search for it leaves a variable Boost_DIR=NOTFOUND in
the cache, even if Boost libraries are found using the regular way.
That patch removes from the cache the variable Boost_DIR, when Boost is
already found, to avoid more confusion for users.
The CMake script was only testing if the sub-directory auxiliary/taucs/
existed. That directory exists in Git for a while, because we ship a README
file in it. Now the CMake script checks for auxiliary/taucs/include/. That
is as naive as before but at least it will work.
/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.
1/ Check the version using 'find_package_handle_standard_args' internal
checking of version, instead of a home-made check.
2/ No need to add EIGEN3_INCLUDE_DIR in the cache, as find_path does it.
3/ Call 'find_package_handle_standard_args' even if EIGEN3_INCLUDE_DIR is
already and valid in the cache.
CGAL_assume(EX) is like CGAL_assertion, but is not disabled in release
mode. In debug mode, it is similar to CGAL_assertion(). In release mode, it
uses builtins of the compilateur, like the MSVC __assume or the g++/clang
__builtin_unreachable to give an hint to the compiler that some situation
in the code cannot happen.
In order to fix such a warning from g++-4.8:
warning: typedef ‘boost_static_assert_typedef_241’ locally defined but
not used [-Wunused-local-typedefs]
then:
- create one macro CGAL_UNUSED that is "__attribute__ ((__unused__))"
with g++ or empty otherwise,
- use it after BOOST_STATIC_ASSERT in the definition of
CGAL_static_assertion.
If the current working directory is a checkout of a commit that is not a
branch, for example, a commit in the ancestors of a branch, then CGAL CMake
scripts gave that CMake error:
== CMake setup ==
fatal: ref HEAD is not a symbolic ref
CMake Error at Installation/cmake/modules/CGAL_SCM.cmake:36 (string):
string sub-command REGEX, mode REPLACE needs at least 6 arguments total to
command.
Call Stack (most recent call first):
CMakeLists.txt:17 (include)
== CMake setup (DONE) ==
This patch fixes the error. If HEAD is not a branch, then CGAL_GIT_BRANCH
is equal to "HEAD".
The Intel Compiler, even when it tries to emulate the GNU/C++ compiler,
does not implement the GNU extension "statement expressions". The macro
CGAL_CFG_NO_STATEMENT_EXPRESSIONS must be defined with __INTEL_COMPILER is
defined.
When one is using the non-deprecated form of the macro, the version of
the deprecation has to be used - not the version where the original
macro appeared first.
- proper indentation
- merge double occurences
- standardize location at the end block, before DOC
tested with GMP(XX), MPFR, MPFI, LEDA, RS(3), NTL and a (small) number of ways to specify library
locations via environment and CMake variables, on Debian 64bit
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.
Those cause trouble, because on MSVC the include paths for tr1
components are different from gcc. Instead of fixing up the include
paths depending on platform, just never use a tr1 component. Nothing
of value is lost compared to the boost equivalents and it removes
another code-path.
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex