Commit f608c3d9 authored by Sylvain Thery's avatar Sylvain Thery

solve pb of compil with gcc 4.9

parent 3cae3e11
...@@ -115,7 +115,7 @@ IF(WIN32) ...@@ -115,7 +115,7 @@ IF(WIN32)
ELSE(WIN32) ELSE(WIN32)
find_package(SuiteSparse REQUIRED) find_package(SuiteSparse REQUIRED)
SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS}) SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${SUITESPARSE_LIBRARIES}) SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${SUITESPARSE_LIBRARIES} pthread)
ENDIF(WIN32) ENDIF(WIN32)
......
...@@ -188,6 +188,7 @@ ADD_EXECUTABLE( SCHNApps ...@@ -188,6 +188,7 @@ ADD_EXECUTABLE( SCHNApps
TARGET_LINK_LIBRARIES( SCHNApps TARGET_LINK_LIBRARIES( SCHNApps
${CGoGN_LIBS} ${CGoGN_LIBS}
${EXT_LIBS} ${EXT_LIBS}
pthread
) )
......
...@@ -3,9 +3,9 @@ QT4_WRAP_UI( PLUGIN_UIC_FILES ${PLUGIN_UI_FILES} ) ...@@ -3,9 +3,9 @@ QT4_WRAP_UI( PLUGIN_UIC_FILES ${PLUGIN_UI_FILES} )
QT4_WRAP_CPP( PLUGIN_MOC_FILES ${PLUGIN_QOBJECT_FILES} ) QT4_WRAP_CPP( PLUGIN_MOC_FILES ${PLUGIN_QOBJECT_FILES} )
IF(APPLE) #IF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib") # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib")
ENDIF(APPLE) #ENDIF(APPLE)
ADD_LIBRARY( ${PLUGIN_NAME} SHARED ADD_LIBRARY( ${PLUGIN_NAME} SHARED
...@@ -17,6 +17,7 @@ ADD_LIBRARY( ${PLUGIN_NAME} SHARED ...@@ -17,6 +17,7 @@ ADD_LIBRARY( ${PLUGIN_NAME} SHARED
TARGET_LINK_LIBRARIES( ${PLUGIN_NAME} TARGET_LINK_LIBRARIES( ${PLUGIN_NAME}
${CGoGN_LIBS} ${CGoGN_LIBS}
${EXT_LIBS} ${EXT_LIBS}
pthread
) )
ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNApps ) ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNApps )
......
...@@ -796,10 +796,7 @@ void SCHNApps::closeEvent(QCloseEvent *event) ...@@ -796,10 +796,7 @@ void SCHNApps::closeEvent(QCloseEvent *event)
v->closeDialogs(); v->closeDialogs();
} }
foreach(Plugin *p, m_plugins)
{
emit(appsFinished()); emit(appsFinished());
}
QMainWindow::closeEvent(event); QMainWindow::closeEvent(event);
} }
......
...@@ -78,7 +78,7 @@ IF(WIN32) ...@@ -78,7 +78,7 @@ IF(WIN32)
ELSE(WIN32) ELSE(WIN32)
find_package(SuiteSparse REQUIRED) find_package(SuiteSparse REQUIRED)
SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS}) SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
SET (COMMON_LIBS ${SUITESPARSE_LIBRARIES} lapack blas ${COMMON_LIBS} ) SET (COMMON_LIBS ${SUITESPARSE_LIBRARIES} lapack blas ${COMMON_LIBS} pthread )
ENDIF(WIN32) ENDIF(WIN32)
......
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