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

9b8f3e9d · Sylvain Thery · e0307c22 · d8f993a0 · 9b8f3e9d · 9b8f3e9d
Commit 9b8f3e9d authored Jan 15, 2013 by Sylvain Thery
Showing with 3 additions and 1 deletion

SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui +1 -1

ThirdParty/Assimp/CMakeLists.txt ThirdParty/Assimp/CMakeLists.txt +2 -0

No files found.
--- a/SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui
+++ b/SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui
@@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>174</width>
+    <width>176</width>
    <height>427</height>
   </rect>
  </property>

--- a/ThirdParty/Assimp/CMakeLists.txt
+++ b/ThirdParty/Assimp/CMakeLists.txt
@@ -16,5 +16,7 @@ ENDIF ( NOT Boost_FOUND )

 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )

+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
 ADD_SUBDIRECTORY( code/ )