Commit b5f3f45d authored by Sylvain Thery's avatar Sylvain Thery

merge bugs

parent 7caafd0a
...@@ -35,12 +35,6 @@ IF (WIN32) ...@@ -35,12 +35,6 @@ IF (WIN32)
SET ( CGoGN_WITH_QTCREATOR OFF CACHE BOOL "use QtCreator to compile (Experimental" ) SET ( CGoGN_WITH_QTCREATOR OFF CACHE BOOL "use QtCreator to compile (Experimental" )
ENDIF() ENDIF()
IF (LINUX)
SET ( CGoGN_GCC_4_9 OFF CACHE BOOL "using gcc version > 4.9 (std::regex ok !)" )
ENDIF()
SET ( BUILD_SHARED_LIBS ON CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" )
checkCpp11Support() checkCpp11Support()
checkCpp11Feature("regex" HAS_CPP11_REGEX "False") checkCpp11Feature("regex" HAS_CPP11_REGEX "False")
...@@ -172,8 +166,12 @@ IF(WIN32) ...@@ -172,8 +166,12 @@ IF(WIN32)
ENDIF () ENDIF ()
IF (CGoGN_GCC_4_9) IF (APPLE)
LIST(APPEND CGoGN_DEFS -DCGOGN_GCC_4_9) LIST(APPEND CGoGN_DEFS -DCGOGN_APPLE)
ENDIF ()
IF (HAS_CPP11_REGEX)
LIST(APPEND CGoGN_DEFS -DHAS_CPP11_REGEX)
ENDIF () ENDIF ()
......
...@@ -28,7 +28,7 @@ ADD_SUBDIRECTORY(surface_modelisation) ...@@ -28,7 +28,7 @@ ADD_SUBDIRECTORY(surface_modelisation)
ADD_SUBDIRECTORY(surface_distance) ADD_SUBDIRECTORY(surface_distance)
ADD_SUBDIRECTORY(surface_radiance) ADD_SUBDIRECTORY(surface_radiance)
ADD_SUBDIRECTORY(cage2D_deformation) #ADD_SUBDIRECTORY(cage2D_deformation)
ADD_SUBDIRECTORY(volume_import) ADD_SUBDIRECTORY(volume_import)
#ADD_SUBDIRECTORY(volume_render) #ADD_SUBDIRECTORY(volume_render)
......
...@@ -36,7 +36,7 @@ MapHandlerGen* Surface_Import_Plugin::importMeshFromFile(const QString& fileName ...@@ -36,7 +36,7 @@ MapHandlerGen* Surface_Import_Plugin::importMeshFromFile(const QString& fileName
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
{ {
pythonRecording("importFromFile", fi.baseName(), fileName); pythonRecording("importMeshFromFile", fi.baseName(), fileName);
MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2); MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2);
if(mhg) if(mhg)
...@@ -80,6 +80,8 @@ MapHandlerGen* Surface_Import_Plugin::importImageFromFile(const QString& fileNam ...@@ -80,6 +80,8 @@ MapHandlerGen* Surface_Import_Plugin::importImageFromFile(const QString& fileNam
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
{ {
pythonRecording("importImageFromFile", fi.baseName(), fileName);
MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2); MapHandlerGen* mhg = m_schnapps->addMap(fi.baseName(), 2);
if(mhg) if(mhg)
{ {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QMouseEvent> #include <QMouseEvent>
#include <QWheelEvent> #include <QWheelEvent>
#include <QWindow> #include <QMessageBox>
namespace CGoGN namespace CGoGN
{ {
......
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