Commit Graph

17 Commits

Author SHA1 Message Date
Laurent Rineau 489e1b2ae1 Remove debug message 2017-11-15 14:47:34 +01:00
Laurent Rineau fe24a4db68 Explicit the dependencies of QGLViewer 2017-11-14 14:08:55 +01:00
Sébastien Loriot 47b7ac3c07 update script to find QGLviewer so that the environment variable is used first 2015-07-10 11:32:20 +02:00
Laurent Rineau 99f8b0d80e Allow to find QGLViewer-qt5 on Windows too 2015-07-06 17:29:39 +02:00
Laurent Rineau 4a7a614e5d Allow to find QGLViewer-qt5_
Conflicts:
	Installation/cmake/modules/FindQGLViewer.cmake
2015-04-03 12:35:37 +02:00
Maxime Gimeno 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +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 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Laurent Rineau 6e731a1656 Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53711 | lrineau | 2010-01-20 21:36:47 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Fix for Debian: Qt4 QGLViewer library is /usr/lib*/libqglviewer-qt4.so
........
  r53718 | lrineau | 2010-01-21 17:57:41 +0100 (Thu, 21 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53717
    |  Author: afabri
    |  Date: 2010-01-21 17:51:49 +0100 (Thu, 21 Jan 2010)
    |  
    |  Log message:
    |  
    |  Add operator for MSVC 2005/2008 to avoid a matching ambiguity
........
  r53720 | lrineau | 2010-01-21 18:06:33 +0100 (Thu, 21 Jan 2010) | 2 lines
  
  Merge r53719 from trunk (VC workaround)
........
  r53724 | lrineau | 2010-01-22 13:34:50 +0100 (Fri, 22 Jan 2010) | 10 lines
  
  Merge from trunk:
    |  New Revision: 53723
    |  Author: afabri
    |  Date: 2010-01-22 13:28:06 +0100 (Fri, 22 Jan 2010)
    |  
    |  Log message:
    |  
    |  Just FK would be nicer, but VC 2005 messes it up with an FK in a base class when compiling degenerate_test.cpp
    | 
........
  r53725 | lrineau | 2010-01-22 13:44:11 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Cartesian<float> gives warnings (about truncation from double to float).
........
  r53728 | lrineau | 2010-01-22 14:26:40 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Fix bashism ==
........
  r53729 | lrineau | 2010-01-22 15:10:25 +0100 (Fri, 22 Jan 2010) | 3 lines
  
  Re-add g++-3.4 in the list of supported compilers (to be synced with the
  testsuite and the CGAL web site).
........
  r53731 | lrineau | 2010-01-22 16:09:52 +0100 (Fri, 22 Jan 2010) | 11 lines
  
  Merge fmo trunk:
    | ------------------------------------------------------------------------
    | r53730 | afabri | 2010-01-22 16:07:59 +0100 (Fri, 22 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/intro.tex
    |    M /trunk/Spatial_searching/doc_tex/Spatial_searching/main.tex
    | 
    | Moved ccAuthor right after the title
    | ------------------------------------------------------------------------
    | 
........
2010-01-22 15:16:54 +00:00
Fernando Cacciola 6fcfa43cd7 Fixed find_package bug in 2.6.3 2009-04-06 13:34:12 +00:00
Laurent Rineau 939aa4304d Merge from branch 3.4:
r47647 | lrineau | 2009-01-05 15:48:29 +0100 (Mon 05 Jan 2009) | 4 lines

Fix buggy behaviour of FindQGLViewer.cmake, which sets QGLVIEWER_LIBRARIES
in the cache, to empty string if QGLViewer is not found. Then, the next
configuration step does not override the variable.
2009-01-05 14:49:32 +00:00
Fernando Cacciola 4bf387c6ca Fix assembling of optimized|debug LEDA libraries 2008-12-02 18:31:31 +00:00
Fernando Cacciola 4a4d927522 Moved cmake modules back (2/3) 2008-11-27 16:36:00 +00:00
Fernando Cacciola 2d5b17b9f4 renamed cmake/modules to lib/CGAL-3.4 (0/1) 2008-11-04 16:00:57 +00:00
Laurent Saboret 69eade49a7 Port to Windows/Visual C++ 2005 2008-11-04 14:15:30 +00:00
Laurent Rineau 8b83ac8319 Make FindQGLViewer debug/relase-aware. 2008-09-08 14:42:37 +00:00
Fernando Cacciola 6e36eda87b CMake stuff moved into the appropriate packages 2008-07-16 20:56:17 +00:00