Laurent Rineau
6e731a1656
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
| ------------------------------------------------------------------------
|
........
62 lines
1.9 KiB
CMake
62 lines
1.9 KiB
CMake
# - Try to find QGLViewer
|
|
# Once done this will define
|
|
#
|
|
# QGLVIEWER_FOUND - system has QGLViewer
|
|
# QGLVIEWER_INCLUDE_DIR - the QGLViewer include directory
|
|
# QGLVIEWER_LIBRARIES - Link these to use QGLViewer
|
|
# QGLVIEWER_DEFINITIONS - Compiler switches required for using QGLViewer
|
|
#
|
|
|
|
find_path(QGLVIEWER_INCLUDE_DIR
|
|
NAMES QGLViewer/qglviewer.h
|
|
PATHS /usr/include
|
|
/usr/local/include
|
|
ENV QGLVIEWERROOT
|
|
)
|
|
|
|
find_library(QGLVIEWER_LIBRARY_RELEASE
|
|
NAMES qglviewer-qt4 qglviewer QGLViewer QGLViewer2
|
|
PATHS /usr/lib
|
|
/usr/local/lib
|
|
ENV QGLVIEWERROOT
|
|
ENV LD_LIBRARY_PATH
|
|
ENV LIBRARY_PATH
|
|
PATH_SUFFIXES QGLViewer QGLViewer/release
|
|
)
|
|
|
|
find_library(QGLVIEWER_LIBRARY_DEBUG
|
|
NAMES dqglviewer dQGLViewer dQGLViewer2
|
|
PATHS /usr/lib
|
|
/usr/local/lib
|
|
ENV QGLVIEWERROOT
|
|
ENV LD_LIBRARY_PATH
|
|
ENV LIBRARY_PATH
|
|
PATH_SUFFIXES QGLViewer QGLViewer/debug
|
|
)
|
|
|
|
if(QGLVIEWER_LIBRARY_RELEASE)
|
|
if(QGLVIEWER_LIBRARY_DEBUG)
|
|
set(QGLVIEWER_LIBRARIES_ optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG})
|
|
else()
|
|
set(QGLVIEWER_LIBRARIES_ ${QGLVIEWER_LIBRARY_RELEASE})
|
|
endif()
|
|
|
|
set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
|
|
|
|
endif()
|
|
|
|
IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
|
|
SET(QGLVIEWER_FOUND TRUE)
|
|
ENDIF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
|
|
|
|
IF(QGLVIEWER_FOUND)
|
|
IF(NOT QGLViewer_FIND_QUIETLY)
|
|
MESSAGE(STATUS "Found QGLViewer: ${QGLVIEWER_LIBRARIES}")
|
|
ENDIF(NOT QGLViewer_FIND_QUIETLY)
|
|
ELSE(QGLVIEWER_FOUND)
|
|
IF(QGLViewer_FIND_REQUIRED)
|
|
MESSAGE(FATAL_ERROR "Could not find QGLViewer")
|
|
ENDIF(QGLViewer_FIND_REQUIRED)
|
|
ENDIF(QGLVIEWER_FOUND)
|
|
|