Merge pull request #3 from manisandro/qt5

Support side-by-side installation of Qt4 and Qt5 builds

Author: mathieu

CMakeLists.txt

@@ -930,18 +930,17 @@ IF(CMAKE_CPACK_COMMAND)
 ENDIF()
 
 # Generate pkg-config configuration files
+IF ( Qt5Widgets_FOUND )
+    SET ( PKGCONFIG_MODULE_NAME osgQt5 )
+ELSE()
+    SET ( PKGCONFIG_MODULE_NAME osgQt )
+ENDIF()
 
-SET(PKGCONFIG_FILES
-  openscenegraph-osgQt
-)
-
-FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})
-  CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in
-    ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
-    @ONLY
-    )
-  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
-ENDFOREACH(PKGCONFIG_FILE)
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph-osgQt.pc.in
+  ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph-${PKGCONFIG_MODULE_NAME}.pc
+  @ONLY
+  )
+INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph-${PKGCONFIG_MODULE_NAME}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
 
 
 # Run this as late as possible so users can easier spot the message

examples/CMakeLists.txt

@@ -4,9 +4,11 @@
 SET(TARGET_DEFAULT_PREFIX "example_")
 SET(TARGET_DEFAULT_LABEL_PREFIX "Examples")
 
-SET(TARGET_COMMON_LIBRARIES
-    osgQt
-)
+IF ( Qt5Widgets_FOUND )
+    SET(TARGET_COMMON_LIBRARIES osgQt5)
+ELSE()
+    SET(TARGET_COMMON_LIBRARIES osgQt)
+ENDIF()
 
 IF(DYNAMIC_OPENSCENEGRAPH)
 

examples/osgQtBrowser/CMakeLists.txt

@@ -15,7 +15,11 @@ endif( QT4_FOUND )
 SET(TARGET_LIBRARIES  ${OPENSCENEGRAPH_LIBRARIES})
 
 #### end var setup  ###
-SET ( EXAMPLE_NAME osgQtBrowser )
+IF ( Qt5Widgets_FOUND )
+    SET ( EXAMPLE_NAME osgQt5Browser )
+ELSE()
+    SET ( EXAMPLE_NAME osgQtBrowser )
+ENDIF()
 SETUP_EXAMPLE(${EXAMPLE_NAME})
 
 IF ( Qt5Widgets_FOUND )

examples/osgQtWidgets/CMakeLists.txt

@@ -15,7 +15,11 @@ endif( QT4_FOUND )
 SET(TARGET_LIBRARIES  ${OPENSCENEGRAPH_LIBRARIES})
 
 #### end var setup  ###
-SET ( EXAMPLE_NAME osgQtWidgets )
+IF ( Qt5Widgets_FOUND )
+    SET ( EXAMPLE_NAME osgQt5Widgets )
+ELSE()
+    SET ( EXAMPLE_NAME osgQtWidgets )
+ENDIF()
 SETUP_EXAMPLE(${EXAMPLE_NAME})
 
 IF ( Qt5Widgets_FOUND )

examples/osgqfont/CMakeLists.txt

@@ -1,6 +1,5 @@
 #this file is automatically generated 
 
-ADD_DEFINITIONS(-DUSE_QT4)
 
 SET(TARGET_SRC osgqfont.cpp )
 SET(TARGET_LIBRARIES  ${OPENSCENEGRAPH_LIBRARIES})
@@ -10,7 +9,11 @@ IF ( NOT Qt5Widgets_FOUND )
 ENDIF()
 
 #### end var setup  ###
-SET ( EXAMPLE_NAME osgqfont )
+IF ( Qt5Widgets_FOUND )
+    SET ( EXAMPLE_NAME osgqfont-qt5 )
+ELSE()
+    SET ( EXAMPLE_NAME osgqfont )
+ENDIF()
 SETUP_EXAMPLE(${EXAMPLE_NAME})
 
 IF ( Qt5Widgets_FOUND )

examples/osgviewerQt/CMakeLists.txt

@@ -6,7 +6,6 @@ IF ( NOT Qt5Widgets_FOUND )
     IF( QT4_FOUND )
     SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE}
         ${QT_QTOPENGL_LIBRARY_RELEASE} )
-    ADD_DEFINITIONS(-DUSE_QT4)
     ELSE( QT4_FOUND )
     SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
     ENDIF( QT4_FOUND )
@@ -17,7 +16,11 @@ ENDIF()
 
 SET(TARGET_LIBRARIES  ${OPENSCENEGRAPH_LIBRARIES})
 
-SET( EXAMPLE_NAME osgviewerQt )
+IF ( Qt5Widgets_FOUND )
+    SET ( EXAMPLE_NAME osgviewerQt5 )
+ELSE()
+    SET ( EXAMPLE_NAME osgviewerQt )
+ENDIF()
 
 SETUP_EXAMPLE( ${EXAMPLE_NAME} )
 

packaging/pkgconfig/openscenegraph-osgQt.pc.in

@@ -5,10 +5,10 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib@LIB_POSTFIX@
 includedir=${prefix}/include
 
-Name: openscenegraph-osgQt
-Description: osgQt utility library.
+Name: openscenegraph-@PKGCONFIG_MODULE_NAME@
+Description: @PKGCONFIG_MODULE_NAME@ utility library.
 Version: @OPENSCENEGRAPH_VERSION@
 Requires: openscenegraph-osgWidget openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads
 Conflicts:
-Libs: -L${libdir} -losgQt@CMAKE_BUILD_POSTFIX@
+Libs: -L${libdir} -l@PKGCONFIG_MODULE_NAME@@CMAKE_BUILD_POSTFIX@
 Cflags: -I${includedir}

src/osgQt/CMakeLists.txt

@@ -5,8 +5,12 @@ ELSE()
     ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF()
 
-SET(LIB_NAME osgQt)
-SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
+IF ( Qt5Widgets_FOUND )
+    SET(LIB_NAME osgQt5)
+ELSE()
+    SET(LIB_NAME osgQt)
+ENDIF()
+SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/osgQt)
 
 SET(SOURCES_H
     ${HEADER_PATH}/QGraphicsViewAdapter