Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
f608c3d9
Commit
f608c3d9
authored
Nov 05, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solve pb of compil with gcc 4.9
parent
3cae3e11
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
CMakeLists.txt
CMakeLists.txt
+1
-1
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-0
SCHNApps/Plugins/plugins_cmake.txt
SCHNApps/Plugins/plugins_cmake.txt
+4
-3
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+0
-3
apps_cmake.txt
apps_cmake.txt
+1
-1
No files found.
CMakeLists.txt
View file @
f608c3d9
...
...
@@ -115,7 +115,7 @@ IF(WIN32)
ELSE
(
WIN32
)
find_package
(
SuiteSparse REQUIRED
)
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
)
...
...
SCHNApps/CMakeLists.txt
View file @
f608c3d9
...
...
@@ -188,6 +188,7 @@ ADD_EXECUTABLE( SCHNApps
TARGET_LINK_LIBRARIES
(
SCHNApps
${
CGoGN_LIBS
}
${
EXT_LIBS
}
pthread
)
...
...
SCHNApps/Plugins/plugins_cmake.txt
View file @
f608c3d9
...
...
@@ -3,9 +3,9 @@ QT4_WRAP_UI( PLUGIN_UIC_FILES ${PLUGIN_UI_FILES} )
QT4_WRAP_CPP( PLUGIN_MOC_FILES ${PLUGIN_QOBJECT_FILES} )
IF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib")
ENDIF(APPLE)
#
IF(APPLE)
#
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib")
#
ENDIF(APPLE)
ADD_LIBRARY( ${PLUGIN_NAME} SHARED
...
...
@@ -17,6 +17,7 @@ ADD_LIBRARY( ${PLUGIN_NAME} SHARED
TARGET_LINK_LIBRARIES( ${PLUGIN_NAME}
${CGoGN_LIBS}
${EXT_LIBS}
pthread
)
ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNApps )
...
...
SCHNApps/src/schnapps.cpp
View file @
f608c3d9
...
...
@@ -796,10 +796,7 @@ void SCHNApps::closeEvent(QCloseEvent *event)
v
->
closeDialogs
();
}
foreach
(
Plugin
*
p
,
m_plugins
)
{
emit
(
appsFinished
());
}
QMainWindow
::
closeEvent
(
event
);
}
...
...
apps_cmake.txt
View file @
f608c3d9
...
...
@@ -78,7 +78,7 @@ IF(WIN32)
ELSE(WIN32)
find_package(SuiteSparse REQUIRED)
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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment