songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF

This commit is contained in:
Andreas Fabri 2015-07-07 11:26:47 +02:00
parent 82e56b036d d164633493
commit ad4a0169fb
31 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AABB_tree/demo/AABB_tree/CMakeLists.txt
View File

@ -14,7 +14,7 @@ endif()
# Include this package's headers first # Include this package's headers first
include_directories( BEFORE ./ ./include ../../include ) include_directories( BEFORE ./ ./include ../../include )
# Find CGAL and CGAL Qt5 # Find CGAL and CGAL Qt5
find_package(CGAL REQUIRED COMPONENTS Qt5 ) find_package(CGAL COMPONENTS Qt5 )
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Find Qt5 itself # Find Qt5 itself

1
AABB_tree/demo/AABB_tree/Scene.cpp
View File

@ -1311,6 +1311,7 @@ void Scene::deactivate_cutting_plane()
} }
void Scene::initGL() void Scene::initGL()
{ {
qDebug()<<"context from scene is valid :"<<context->isValid();
initializeOpenGLFunctions(); initializeOpenGLFunctions();
glGenTextures(1, &textureId); glGenTextures(1, &textureId);
compile_shaders(); compile_shaders();

1
AABB_tree/demo/AABB_tree/Viewer.cpp
View File

@ -31,6 +31,7 @@ void Viewer::initializeGL()
QGLViewer::initializeGL(); QGLViewer::initializeGL();
setBackgroundColor(::Qt::white); setBackgroundColor(::Qt::white);
m_pScene->context = this->context(); m_pScene->context = this->context();
qDebug()<<"context from viewer is valid :"<<this->context()->isValid();
m_pScene->initGL(); m_pScene->initGL();
} }

2
Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
View File

@ -26,7 +26,7 @@ include( ${CGAL_USE_FILE} )
include( CGAL_CreateSingleSourceCGALProgram ) include( CGAL_CreateSingleSourceCGALProgram )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )

2
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
View File

@ -11,7 +11,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL)

2
BGL/test/BGL/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include( ${CGAL_USE_FILE} )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )
message(STATUS "This project requires the Boost library, and will not be compiled.") message(STATUS "This project requires the Boost library, and will not be compiled.")

2
CGAL_Core/examples/Core/CMakeLists.txt
View File

@ -33,7 +33,7 @@ include( ${CGAL_USE_FILE} )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )

2
Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
View File

@ -5,7 +5,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL)

2
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Generator/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/GraphicsView/CMakeLists.txt
View File

@ -7,7 +7,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW ) cmake_policy( SET CMP0003 NEW )
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5 REQUIRED) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Polygon/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5 Core) find_package(CGAL COMPONENTS Qt5 Core)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
GraphicsView/demo/Triangulation_2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
View File

@ -30,7 +30,7 @@ endif()
add_definitions(-DCGAL_PROFILE_LCC_DEMO) add_definitions(-DCGAL_PROFILE_LCC_DEMO)
################## ##################
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL)

2
Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt
View File

@ -14,7 +14,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
include_directories( BEFORE ${Mesh_3_implicit_functions_BINARY_DIR} ../include ) include_directories( BEFORE ${Mesh_3_implicit_functions_BINARY_DIR} ../include )
# Find CGAL and CGAL Qt5 # Find CGAL and CGAL Qt5
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Find Qt5 itself # Find Qt5 itself

2
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if(POLICY CMP0043)
endif() endif()
# Find CGAL # Find CGAL
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Find Qt5 itself # Find Qt5 itself

2
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
View File

@ -12,7 +12,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) cmake_policy(SET CMP0043 OLD)
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

2
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -53,7 +53,7 @@ set( QT_USE_QTOPENGL TRUE )
if( POLYHEDRON_QTSCRIPT_DEBUGGER) if( POLYHEDRON_QTSCRIPT_DEBUGGER)
set( QT_USE_QTSCRIPTTOOLS TRUE ) set( QT_USE_QTSCRIPTTOOLS TRUE )
endif() endif()
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
find_package(Qt5 COMPONENTS OpenGL Script Svg Xml ScriptTools) find_package(Qt5 COMPONENTS OpenGL Script Svg Xml ScriptTools)

2
Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include( ${CGAL_USE_FILE} )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )

2
Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
View File

@ -16,7 +16,7 @@ endforeach()
include_directories( ./ ) include_directories( ./ )
# Find CGAL and CGAL Qt5 # Find CGAL and CGAL Qt5
find_package(CGAL REQUIRED COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Find Qt5 itself # Find Qt5 itself

2
Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include( ${CGAL_USE_FILE} )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )

2
Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include( ${CGAL_USE_FILE} )
# Boost and its components # Boost and its components
find_package( Boost REQUIRED ) find_package( Boost )
if ( NOT Boost_FOUND ) if ( NOT Boost_FOUND )

4
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
View File

@ -36,7 +36,7 @@ set( QT_USE_QTXML TRUE )
set( QT_USE_QTMAIN TRUE ) set( QT_USE_QTMAIN TRUE )
find_package(CGAL COMPONENTS ImageIO Qt5) find_package(CGAL COMPONENTS ImageIO Qt5)
if ( CGAL_FOUND AND CGAL_Qt5_FOUND) if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
add_definitions(-DQT_NO_KEYWORDS) add_definitions(-DQT_NO_KEYWORDS)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
@ -45,7 +45,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND)
find_package(QGLViewer ) find_package(QGLViewer )
find_package(OpenGL ) find_package(OpenGL )
if ( QGLVIEWER_FOUND ) if ( QGLVIEWER_FOUND AND Qt5_FOUND)
include_directories( ${QGLVIEWER_INCLUDE_DIR} ) include_directories( ${QGLVIEWER_INCLUDE_DIR} )