Skip to content
Snippets Groups Projects
Commit 07a34a3d authored by vahrenkamp's avatar vahrenkamp
Browse files

fixed link order

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@533 042f3d55-54a8-47e9-b7fb-15903f145c44
parent 03aca574
No related branches found
No related tags found
No related merge requests found
......@@ -54,11 +54,12 @@ if (SimDynamics_USE_BULLET)
FIND_PACKAGE(OpenGL)
IF (OPENGL_FOUND)
MESSAGE (STATUS " ** OPENGL FOUND lib:${OPENGL_gl_LIBRARY}")
SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_gl_LIBRARY})
LIST(APPEND SimDynamics_PHYSICS_LIBRARIES ";debug;${OPENGL_gl_LIBRARY};optimized;${OPENGL_gl_LIBRARY}")
ENDIF()
IF (OPENGL_GLU_FOUND)
MESSAGE (STATUS " ** OPENGL_GLU FOUND lib:${OPENGL_glu_LIBRARY}")
SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_glu_LIBRARY})
LIST(APPEND SimDynamics_PHYSICS_LIBRARIES ";debug;${OPENGL_glu_LIBRARY};optimized;${OPENGL_glu_LIBRARY}")
#SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_glu_LIBRARY})
ENDIF()
IF (SimDynamics_USE_BULLET_USE_GLUT)
......@@ -191,11 +192,12 @@ if (SimDynamics_DYNAMICSENGINE)
ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
ADD_LIBRARY (SimDynamics SHARED ${SOURCES} ${INCLUDES})
TARGET_LINK_LIBRARIES (SimDynamics ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
if (SimDynamics_BULLET_OpenGL)
TARGET_LINK_LIBRARIES (SimDynamics BulletOpenGLSupport)
SET (SimDynamics_BULLET_OpenGL TRUE PARENT_SCOPE) # inform parent scope about BulletOpenGLSupport
ENDIF(SimDynamics_BULLET_OpenGL)
TARGET_LINK_LIBRARIES (SimDynamics ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
# .so path
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment