Fixing openGL/Glu search for bullet examples

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@289 042f3d55-54a8-47e9-b7fb-15903f145c44

SimDynamics/config.cmake

@@ -71,11 +71,19 @@ IF (NOT SimDynamics_CONFIGURED)
             SET (SimDynamics_DYNAMICSENGINE TRUE)
             
             IF (SimDynamics_USE_BULLET_USE_GLUT)
+	            FIND_PACKAGE(OpenGL)
+	            IF (OPENGL_FOUND)
+		      MESSAGE ("OPENGL FOUND lib:"${OPENGL_gl_LIBRARY})
+		    ENDIF()
+	            IF (OPENGL_GLU_FOUND)
+		      MESSAGE ("OPENGL_GLU FOUND lib:"${OPENGL_glu_LIBRARY})
+		    ENDIF()
+
 	            FIND_PACKAGE(GLUT)
 	            IF (GLUT_FOUND)
 	                MESSAGE("GLUT FOUND")
 	                MESSAGE(${GLUT_glut_LIBRARY})
-	                SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${GLUT_glut_LIBRARY})
+	                SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
 	            ELSE (GLUT_FOUND)
     	            SET( GLUT_glut_LIBRARY "" CACHE PATH "Glut library." )
                     #IF (MSVC)

SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt

@@ -5,39 +5,44 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
 CMAKE_POLICY(VERSION 2.6)
 
 IF(Simox_USE_COIN_VISUALIZATION)
+
+    INCLUDE(${QT_USE_FILE})
     
     LINK_DIRECTORIES(${SimDynamics_LIB_DIR})
     
-	    
-	# the variable "demo_SRCS" contains all .cpp files of this project
-	FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/SimDynamicsViewer.cpp ${PROJECT_SOURCE_DIR}/SimDynamicsWindow.cpp)
-	FILE(GLOB demo_INCS ${PROJECT_SOURCE_DIR}/SimDynamicsWindow.h)
+
+    # the variable "demo_SRCS" contains all .cpp files of this project
+    FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/SimDynamicsViewer.cpp ${PROJECT_SOURCE_DIR}/simDynamicsWindow.cpp)
+    FILE(GLOB demo_INCS ${PROJECT_SOURCE_DIR}/simDynamicsWindow.h)
 
   
     ################################## moc'ing ##############################
     set(GUI_MOC_HDRS
-        ${PROJECT_SOURCE_DIR}/SimDynamicsWindow.h
+        ${PROJECT_SOURCE_DIR}/simDynamicsWindow.h
     )
 
     set(GUI_UIS
-        ${PROJECT_SOURCE_DIR}/SimDynamicsViewer.ui
+        ${PROJECT_SOURCE_DIR}/simDynamicsViewer.ui
     )
 
-    qt4_wrap_cpp(demo_SRCS ${GUI_MOC_HDRS})
-    qt4_wrap_ui(UI_HEADER ${GUI_UIS})
-    get_filename_component(UI_HEADER_DIR ${UI_HEADER} PATH)
-    list(APPEND demo_INCS ${UI_HEADER})
+    SimoxQtApplication("${PROJECT_NAME}" "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
 
-    include_directories(${UI_HEADER_DIR})
 
-    ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
+    #qt4_wrap_cpp(demo_SRCS ${GUI_MOC_HDRS})
+    #qt4_wrap_ui(UI_HEADER ${GUI_UIS})
+    #get_filename_component(UI_HEADER_DIR ${UI_HEADER} PATH)
+    #list(APPEND demo_INCS ${UI_HEADER})
+
+    #include_directories(${UI_HEADER_DIR})
+
+    #ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
     SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
     SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SimDynamics_BIN_DIR})
 
     TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS} SimDynamics ${SimDynamics_PHYSICS_LIBRARIES})
     INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
-    INCLUDE(${QT_USE_FILE})
-    ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
+    #
+    #ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
 
     INSTALL(TARGETS ${PROJECT_NAME}
         DESTINATION ${SimDynamics_INSTALL_BIN_DIR})