Skip to content
GitLab
Commit 9b8f3e9d authored by Sylvain Thery's avatar Sylvain Thery
Browse files

Merge branch 'master' of cgogn:~kraemer/CGoGN

parents e0307c22 d8f993a0
Hide whitespace changes
Inline Side-by-side
SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui
View file @ 9b8f3e9d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>174</width> <width>176</width>
<height>427</height> <height>427</height>
</rect> </rect>
</property> </property>
......
ThirdParty/Assimp/CMakeLists.txt
View file @ 9b8f3e9d
...@@ -16,5 +16,7 @@ ENDIF ( NOT Boost_FOUND ) ...@@ -16,5 +16,7 @@ ENDIF ( NOT Boost_FOUND )
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
ADD_SUBDIRECTORY( code/ ) ADD_SUBDIRECTORY( code/ )
Supports Markdown
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