Skip to content
Snippets Groups Projects
Unverified Commit 368b39d1 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #91 from nim65s/devel 

[CMake] look for openscenegraph-osgQt5 for Qt5
parents d94d64c4 66d00467
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 8
− 1
View file @ 368b39d1
...@@ -58,7 +58,14 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4") ...@@ -58,7 +58,14 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
IF(NOT CLIENT_ONLY) IF(NOT CLIENT_ONLY)
ADD_REQUIRED_DEPENDENCY("openscenegraph >= 3.2") ADD_REQUIRED_DEPENDENCY("openscenegraph >= 3.2")
ADD_REQUIRED_DEPENDENCY("openscenegraph-osgQt")
IF(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
SET(OSGQT_LIB_NAME openscenegraph-osgQt)
ELSE(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
SET(OSGQT_LIB_NAME openscenegraph-osgQt5)
ENDIF(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
ADD_REQUIRED_DEPENDENCY(${OSGQT_LIB_NAME})
ADD_REQUIRED_DEPENDENCY("openthreads >= 2.6") ADD_REQUIRED_DEPENDENCY("openthreads >= 2.6")
ADD_REQUIRED_DEPENDENCY("gepetto-viewer") ADD_REQUIRED_DEPENDENCY("gepetto-viewer")
ADD_REQUIRED_DEPENDENCY("urdfdom") ADD_REQUIRED_DEPENDENCY("urdfdom")
......
src/gui/CMakeLists.txt
+ 1
− 1
View file @ 368b39d1
...@@ -88,7 +88,7 @@ TARGET_LINK_LIBRARIES(gepetto-gui ${PROJECT_NAME} ${QT_LIBRARIES}) ...@@ -88,7 +88,7 @@ TARGET_LINK_LIBRARIES(gepetto-gui ${PROJECT_NAME} ${QT_LIBRARIES})
PKG_CONFIG_USE_DEPENDENCY(gepetto-gui gepetto-viewer) PKG_CONFIG_USE_DEPENDENCY(gepetto-gui gepetto-viewer)
PKG_CONFIG_USE_DEPENDENCY(gepetto-gui openscenegraph) PKG_CONFIG_USE_DEPENDENCY(gepetto-gui openscenegraph)
PKG_CONFIG_USE_DEPENDENCY(gepetto-gui openthreads) PKG_CONFIG_USE_DEPENDENCY(gepetto-gui openthreads)
PKG_CONFIG_USE_DEPENDENCY(gepetto-gui openscenegraph-osgQt) PKG_CONFIG_USE_DEPENDENCY(gepetto-gui ${OSGQT_LIB_NAME})
PKG_CONFIG_USE_DEPENDENCY(gepetto-gui omniORB4) PKG_CONFIG_USE_DEPENDENCY(gepetto-gui omniORB4)
IF (GEPETTO_GUI_HAS_PYTHONQT) IF (GEPETTO_GUI_HAS_PYTHONQT)
TARGET_LINK_LIBRARIES(gepetto-gui ${PYTHONQT_LIBRARIES}) TARGET_LINK_LIBRARIES(gepetto-gui ${PYTHONQT_LIBRARIES})
......
tests/CMakeLists.txt
+ 1
− 1
View file @ 368b39d1
...@@ -39,7 +39,7 @@ MACRO(ADD_TESTCASE NAME GENERATED) ...@@ -39,7 +39,7 @@ MACRO(ADD_TESTCASE NAME GENERATED)
TARGET_LINK_LIBRARIES(${NAME} ${QT_LIBRARIES}) TARGET_LINK_LIBRARIES(${NAME} ${QT_LIBRARIES})
PKG_CONFIG_USE_DEPENDENCY(${NAME} openscenegraph) PKG_CONFIG_USE_DEPENDENCY(${NAME} openscenegraph)
PKG_CONFIG_USE_DEPENDENCY(${NAME} openthreads) PKG_CONFIG_USE_DEPENDENCY(${NAME} openthreads)
PKG_CONFIG_USE_DEPENDENCY(${NAME} openscenegraph-osgQt) PKG_CONFIG_USE_DEPENDENCY(${NAME} ${OSGQT_LIB_NAME})
PKG_CONFIG_USE_DEPENDENCY(${NAME} gepetto-viewer) PKG_CONFIG_USE_DEPENDENCY(${NAME} gepetto-viewer)
ENDMACRO(ADD_TESTCASE) ENDMACRO(ADD_TESTCASE)
......
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