Commit Graph

63 Commits

Author SHA1 Message Date
Sébastien Loriot bb3264c563 remove conditions that are outdated 2015-02-05 14:46:36 +01:00
Clement Jamin 3e873a1f5c Fix #ifdef mismatch bug 2014-07-01 17:02:09 +02:00
Clement Jamin 1bb441317d Add missing CGAL_ prefix 2014-07-01 16:57:26 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Sébastien Loriot 5de63179f0 setMouseBindingDescription API has been updated in libQGLViewer 2.5.0 2014-06-18 15:45:22 +02:00
Clement Jamin f3c00442fd Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-05-14 19:05:40 +02:00
Jane Tournois 1b5f70c871 fix deprecation warning 2014-05-12 12:57:33 +02:00
Clement Jamin 6e8625845b Code and comments clean-up 2014-04-08 10:26:00 +02:00
Clement Jamin 6b65ad71da Changes in the "lock data structure" concept and models
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
Clement Jamin 72d877ffc7 Updated the TDS typedef in the T3 demo 2013-10-14 17:55:13 +02:00
Clement Jamin 04c1a83977 Minor alignment change 2013-06-28 15:18:13 +02:00
Clement Jamin 079c39eef4 Update CMakeLists according to changes in FindTBB 2013-06-28 15:16:49 +02:00
Clement Jamin eeeb6cc841 Smaller tag names (continued) 2013-05-28 15:42:39 +02:00
Clement Jamin 1cc98e9abd Updated doc + code clean-up 2013-04-03 17:34:21 +02:00
Clement Jamin 9b3b218b9c Bugfix
The sequential version doesn't know what "TBB" is!
2013-03-27 14:31:09 +01:00
Clement Jamin db6b4e9559 Updated the demo (parallel code) 2013-03-27 14:02:09 +01:00
Clement Jamin de1f43e30b The remove is now fully parallel.
The remove operations are done in parallel as long as the dimension stays = 3, then the few remaining points are removed sequentially.
2013-03-27 13:47:40 +01:00
Clement Jamin 3eae2927e7 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-03-04 15:50:57 +01:00
Clement Jamin 8d5352e15f Better grid lock data structure.
There is just one grid lock data structure class now, with several specialization.
Moreover, now the type of the lock data structure is only defined in the triangulation.
2013-02-18 12:58:57 +01:00
Clement Jamin bce43fbb8e Improved the way parallelism is handle in Mesh_3/Triangulation_3
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
2013-02-15 18:07:43 +01:00
Andreas Fabri 516579f454 reverse accidental commit of a cmake target 2013-02-15 09:27:12 +01:00
Andreas Fabri abab3ad602 Suppress warnings in spatial_sort used with a QList.
The bug of Qt is that they have ptrdiff_t as difference type,
but they only provide   iterator + int  and not
iterator + difference_type
2013-02-14 15:38:05 +01:00
Andreas Fabri f8b8e7c643 0.1 -> 0.1f to avoid a warning 2013-02-08 12:45:30 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01: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
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau c7ca93c07e Include <CGAL/glu.h> before any use of GLU 2011-11-09 14:24:17 +00:00
Philipp Möller f9b288db90 Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Laurent Rineau 78b2f8ba39 Remove the use of QT ASSISTANT in CMakeLists.txt (not actually used) 2011-06-14 14:02:42 +00:00
Laurent Rineau 3c02e07b23 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.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Sébastien Loriot 7605aa0891 remove generated file and remove warnings 2011-02-23 10:00:48 +00:00
Monique Teillaud 48889a4c7e one more icon cleaned 2011-01-03 08:02:30 +00:00
Monique Teillaud ae537cc23e cosmetic 2011-01-02 18:08:30 +00:00
Monique Teillaud 8a312f551e improve some comments 2011-01-02 18:04:50 +00:00
Monique Teillaud fc9fa9aebb a few icons replaced by home-made icons (using ipe) 2011-01-02 17:58:54 +00:00
Monique Teillaud 33ff6e921e yet another missing file... 2010-12-21 09:30:53 +00:00
Monique Teillaud 2cfe7faeb9 added missing file 2010-12-21 09:23:10 +00:00
Monique Teillaud 543fec7ccf new T3 demo using Qt4 and QGLViewer
This demo was written in the framework of the GSoC by Fei (Sophie) Che, co-mentored by Manuel and me.
2010-12-20 13:31:30 +00:00
Monique Teillaud a363b9f1fa Geomview demos moved one floor up 2010-12-20 13:05:32 +00:00
Monique Teillaud b74c45cc26 directory for Geomview demos 2010-12-20 13:02:37 +00:00
Sylvain Pion e80a597760 Fix typos. 2009-11-05 12:29:42 +00:00
Sylvain Pion 828a6eeabc Merge the Triangulation_3_Location_policy branch.
- Deprecate the "hierarchy" implementation detail in the package API.
- Introduce a Location_policy parameter instead.
- Add a "Complexity and Performance" section in the user manual.
- Add a benchmark program (dont_submit'ed for now)

Note : merge done by hand as svnmerge.py got too easily confused...
2009-11-04 12:57:51 +00:00
Sylvain Pion 70ec9b7ff7 Remove obsolete (?) makefile. 2009-07-20 09:40:24 +00:00
Laurent Rineau a14be60b7b rename T3 demo .cpp, to avoid duplicated target names 2008-12-15 09:44:03 +00:00
Laurent Rineau 50c483ccb7 Commit missing CMakeLists.txt for demos. 2008-12-10 11:03:43 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00