Merge pull request #3 from cgmb/fix-ubuntu-linking

janbender · janbender · commit 6464882253b1 · 2015-06-19T09:14:45.000+02:00
Fix link order on Ubuntu 14.04
diff --git a/Demos/BarDemo/CMakeLists.txt b/Demos/BarDemo/CMakeLists.txt
@@ -9,9 +9,9 @@ else()
   find_package(OpenGL REQUIRED)
 
   set(SIMULATION_LINK_LIBRARIES
+    ${SIMULATION_LINK_LIBRARIES}
     ${GLUT_LIBRARIES}
     ${OPENGL_LIBRARIES}
-    ${SIMULATION_LINK_LIBRARIES}
   )
 endif()
 
diff --git a/Demos/ClothDemo/CMakeLists.txt b/Demos/ClothDemo/CMakeLists.txt
@@ -9,9 +9,9 @@ else()
   find_package(OpenGL REQUIRED)
 
   set(SIMULATION_LINK_LIBRARIES
+    ${SIMULATION_LINK_LIBRARIES}
     ${GLUT_LIBRARIES}
     ${OPENGL_LIBRARIES}
-    ${SIMULATION_LINK_LIBRARIES}
   )
 endif()
 
diff --git a/Demos/FluidDemo/CMakeLists.txt b/Demos/FluidDemo/CMakeLists.txt
@@ -9,9 +9,9 @@ else()
   find_package(OpenGL REQUIRED)
 
   set(SIMULATION_LINK_LIBRARIES
+    ${SIMULATION_LINK_LIBRARIES}
     ${GLUT_LIBRARIES}
     ${OPENGL_LIBRARIES}
-    ${SIMULATION_LINK_LIBRARIES}
   )
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ else()`
`9`	`9`	`find_package(OpenGL REQUIRED)`
`10`	`10`
`11`	`11`	`set(SIMULATION_LINK_LIBRARIES`
	`12`	`+ ${SIMULATION_LINK_LIBRARIES}`
`12`	`13`	`${GLUT_LIBRARIES}`
`13`	`14`	`${OPENGL_LIBRARIES}`
`14`		`- ${SIMULATION_LINK_LIBRARIES}`
`15`	`15`	`)`
`16`	`16`	`endif()`
`17`	`17`