Commit 34bee0a6 authored by Thery Sylvain's avatar Thery Sylvain

remove some warnings on mac

parent e55a08ee
...@@ -6,7 +6,9 @@ project(Tutos) ...@@ -6,7 +6,9 @@ project(Tutos)
#SET (CMAKE_BUILD_TYPE Debug) #SET (CMAKE_BUILD_TYPE Debug)
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING") #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
# ${CGoGN_ROOT_DIR}/include # ${CGoGN_ROOT_DIR}/include
......
...@@ -151,10 +151,6 @@ IF (WITH_GLEWMX) ...@@ -151,10 +151,6 @@ IF (WITH_GLEWMX)
ADD_DEFINITIONS(-DGLEW_MX) ADD_DEFINITIONS(-DGLEW_MX)
ENDIF (WITH_GLEWMX) ENDIF (WITH_GLEWMX)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
endif()
# qq definition specifiques pour mac # qq definition specifiques pour mac
#IF(APPLE) #IF(APPLE)
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX") # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX")
...@@ -178,7 +174,9 @@ ELSE() ...@@ -178,7 +174,9 @@ ELSE()
endif() endif()
ENDIF() ENDIF()
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
endif()
IF(WIN32) IF(WIN32)
......
...@@ -106,7 +106,7 @@ SET (EXT_LIBS ...@@ -106,7 +106,7 @@ SET (EXT_LIBS
#ENDIF(APPLE) #ENDIF(APPLE)
if(APPLE) if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup")
endif() endif()
......
...@@ -219,8 +219,10 @@ void ControlDock_MapTab::removeSelector() ...@@ -219,8 +219,10 @@ void ControlDock_MapTab::removeSelector()
void ControlDock_MapTab::mapAdded(MapHandlerGen* m) void ControlDock_MapTab::mapAdded(MapHandlerGen* m)
{ {
b_updatingUI = true; b_updatingUI = true;
QListWidgetItem* item = new QListWidgetItem(m->getName(), list_maps); // QListWidgetItem* item = new QListWidgetItem(m->getName(), list_maps);
// item->setCheckState(Qt::Unchecked); // item->setCheckState(Qt::Unchecked);
new QListWidgetItem(m->getName(), list_maps);
b_updatingUI = false; b_updatingUI = false;
} }
......
...@@ -109,7 +109,8 @@ void ControlDock_PluginTab::pluginEnabled(Plugin *plugin) ...@@ -109,7 +109,8 @@ void ControlDock_PluginTab::pluginEnabled(Plugin *plugin)
if(!av.empty()) if(!av.empty())
delete av[0]; delete av[0];
QListWidgetItem* item = new QListWidgetItem(pluginName, list_pluginsEnabled); // QListWidgetItem* item = new QListWidgetItem(pluginName, list_pluginsEnabled);
new QListWidgetItem(pluginName, list_pluginsEnabled);
// only interaction plugins are checkable (i.e. can be associated to a view) // only interaction plugins are checkable (i.e. can be associated to a view)
// PluginInteraction* p = dynamic_cast<PluginInteraction*>(plugin); // PluginInteraction* p = dynamic_cast<PluginInteraction*>(plugin);
......
...@@ -28,7 +28,7 @@ View::View(const QString& name, SCHNApps* s, const QGLWidget* shareWidget) : ...@@ -28,7 +28,7 @@ View::View(const QString& name, SCHNApps* s, const QGLWidget* shareWidget) :
m_name(name), m_name(name),
m_schnapps(s), m_schnapps(s),
m_currentCamera(NULL), m_currentCamera(NULL),
m_lastSelectedMap(NULL), // m_lastSelectedMap(NULL),
m_buttonArea(NULL), m_buttonArea(NULL),
m_closeButton(NULL), m_closeButton(NULL),
m_VsplitButton(NULL), m_VsplitButton(NULL),
......
...@@ -252,7 +252,7 @@ void computeOneRingAreaVertices(typename PFP::MAP& map, const VertexAttribute<ty ...@@ -252,7 +252,7 @@ void computeOneRingAreaVertices(typename PFP::MAP& map, const VertexAttribute<ty
template <typename PFP> template <typename PFP>
void computeBarycentricAreaVertices(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, VertexAttribute<typename PFP::REAL, typename PFP::MAP>& vertex_area) void computeBarycentricAreaVertices(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, VertexAttribute<typename PFP::REAL, typename PFP::MAP>& vertex_area)
{ {
CGoGN::Parallel::foreach_cell<VERTEX>(map, [&] (Vertex v, unsigned int thr) CGoGN::Parallel::foreach_cell<VERTEX>(map, [&] (Vertex v, unsigned int /*thr*/)
{ {
vertex_area[v] = vertexBarycentricArea<PFP>(map, v, position) ; vertex_area[v] = vertexBarycentricArea<PFP>(map, v, position) ;
}, FORCE_CELL_MARKING); }, FORCE_CELL_MARKING);
......
...@@ -455,7 +455,7 @@ bool Image<DataType>::loadVTKBinaryMask(const char* filename) ...@@ -455,7 +455,7 @@ bool Image<DataType>::loadVTKBinaryMask(const char* filename)
template< typename DataType > template< typename DataType >
bool Image<DataType>::loadIPB(const char* filename) bool Image<DataType>::loadIPB(const char* /*filename*/)
{ {
// chargement fichier // chargement fichier
......
...@@ -76,7 +76,7 @@ Inclusion isSegmentInTriangle(const VEC3& P1, const VEC3& P2, const VEC3& Ta, co ...@@ -76,7 +76,7 @@ Inclusion isSegmentInTriangle(const VEC3& P1, const VEC3& P2, const VEC3& Ta, co
* @return true if the faces of the tetra are in CCW order (default=true) * @return true if the faces of the tetra are in CCW order (default=true)
*/ */
template <typename VEC3> template <typename VEC3>
bool isPointInTetrahedron(VEC3 points[4], VEC3& point, bool CCW) ; bool isPointInTetrahedron(VEC3 points[4], VEC3& point, bool /*CCW*/) ;
/** /**
* test if an edge is inside or intersect a tetrahedron * test if an edge is inside or intersect a tetrahedron
......
...@@ -124,7 +124,7 @@ Inclusion isSegmentInTriangle2D(const VEC3& P1, const VEC3& P2, const VEC3& Ta, ...@@ -124,7 +124,7 @@ Inclusion isSegmentInTriangle2D(const VEC3& P1, const VEC3& P2, const VEC3& Ta,
} }
template <typename VEC3> template <typename VEC3>
bool isPointInTetrahedron(VEC3 points[4], VEC3& point, bool CCW) bool isPointInTetrahedron(VEC3 points[4], VEC3& point, bool /*CCW*/)
{ {
typedef typename VEC3::DATA_TYPE T ; typedef typename VEC3::DATA_TYPE T ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment