Skip to content

Use include/osgQt also for osgQt5 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2017
Merged

Use include/osgQt also for osgQt5 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c735f5
Use include/osgQt also for osgQt5
manisandro Mar 14, 2017
f1b0a80
Drop osgQt/Version
manisandro Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions CMakeModules/ModuleInstall.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
# ${LIB_NAME}
# ${TARGET_H}

SET(INSTALL_INCDIR include)
# Optional Vars:
# ${HEADER_INSTALL_DIR}

IF(HEADER_INSTALL_DIR)
SET(INSTALL_INCDIR include/${HEADER_INSTALL_DIR})
ELSE()
SET(INSTALL_INCDIR include/${LIB_NAME})
ENDIF()

SET(INSTALL_BINDIR bin)
IF(WIN32)
SET(INSTALL_LIBDIR bin)
Expand Down Expand Up @@ -40,7 +48,7 @@ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
IF(NOT OSG_COMPILE_FRAMEWORKS)
INSTALL (
FILES ${TARGET_H}
DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
DESTINATION ${INSTALL_INCDIR}
COMPONENT libopenscenegraph-dev
)
ELSE()
Expand Down
1 change: 1 addition & 0 deletions CMakeModules/OsgMacroUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ ENDMACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
# TARGET_LIBRARIES are the libraries to link to that are internal to the project and have d suffix for debug
# TARGET_EXTERNAL_LIBRARIES are external libraries and are not differentiated with d suffix
# TARGET_LABEL is the label IDE should show up for targets
# HEADER_INSTALL_DIR the directory relative to include/ where the ModuleInstall script installs the headers - defaults to LIB_NAME
##########################################################################################################

MACRO(SETUP_LIBRARY LIB_NAME)
Expand Down
1 change: 0 additions & 1 deletion include/osgQt/GraphicsWindowQt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <osgViewer/GraphicsWindow>
#include <osgQt/Export>
#include <osgQt/Version>

#include <QMutex>
#include <QEvent>
Expand Down
1 change: 0 additions & 1 deletion include/osgQt/QFontImplementation
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include <osgText/Font>
#include <osgQt/Export>
#include <osgQt/Version>

#include <QtGui/QFont>

Expand Down
1 change: 0 additions & 1 deletion include/osgQt/QGraphicsViewAdapter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <osg/Image>
#include <osg/observer_ptr>
#include <osgQt/Export>
#include <osgQt/Version>

#include <QPointer>
#include <QGraphicsScene>
Expand Down
1 change: 0 additions & 1 deletion include/osgQt/QWebViewImage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include <osgWidget/Browser>
#include <osgQt/QGraphicsViewAdapter>
#include <osgQt/Version>

namespace osgQt
{
Expand Down
1 change: 0 additions & 1 deletion include/osgQt/QWidgetImage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#define QWIDGETIMAGE

#include <osgQt/QGraphicsViewAdapter>
#include <osgQt/Version>
#include <osg/Image>

namespace osgQt
Expand Down
5 changes: 1 addition & 4 deletions src/osgQt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENDIF()

IF ( Qt5Widgets_FOUND )
SET(LIB_NAME osgQt5)
SET(HEADER_INSTALL_DIR osgQt)
ELSE()
SET(LIB_NAME osgQt)
ENDIF()
Expand All @@ -25,17 +26,13 @@ ELSE()
set(OSGQT_QT_VERSION 4)
ENDIF()

SET(OSGQT_VERSION_HEADER "${PROJECT_BINARY_DIR}/include/osgQt/Version")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Version.in" ${OSGQT_VERSION_HEADER})

SET(TARGET_H
${HEADER_PATH}/Export
${HEADER_PATH}/GraphicsWindowQt
${HEADER_PATH}/QFontImplementation
${HEADER_PATH}/QGraphicsViewAdapter
${HEADER_PATH}/QWidgetImage
${HEADER_PATH}/QWebViewImage
${OSGQT_VERSION_HEADER}
)


Expand Down
12 changes: 0 additions & 12 deletions src/osgQt/Version.in
View file
Open in desktop

This file was deleted.