CMakeLists.txt   CMakeLists.txt 
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
gui gui
${CMAKE_BINARY_DIR}/plugins/Scenery3d/src ${CMAKE_BINARY_DIR}/plugins/Scenery3d/src
${CMAKE_BINARY_DIR}/plugins/Scenery3d/src/gui ${CMAKE_BINARY_DIR}/plugins/Scenery3d/src/gui
) )
LINK_DIRECTORIES(${BUILD_DIR}/src) LINK_DIRECTORIES(${BUILD_DIR}/src)
SET(Scenery3d_SRCS SET(Scenery3d_SRCS
AABB.hpp
AABB.cpp
Frustum.hpp Frustum.hpp
Frustum.cpp Frustum.cpp
GLFuncs.hpp GLFuncs.hpp
Line.hpp
Line.cpp
Plane.hpp Plane.hpp
Plane.cpp Plane.cpp
SPolygon.hpp SPolygon.hpp
SPolygon.cpp SPolygon.cpp
Polyhedron.hpp Polyhedron.hpp
Polyhedron.cpp Polyhedron.cpp
S3DEnum.hpp S3DEnum.hpp
SceneInfo.hpp SceneInfo.hpp
SceneInfo.cpp SceneInfo.cpp
S3DScene.hpp
S3DScene.cpp
Scenery3d.hpp Scenery3d.hpp
Scenery3d.cpp Scenery3d.cpp
Scenery3dMgr.hpp Scenery3dRemoteControlService.hpp
Scenery3dMgr.cpp Scenery3dRemoteControlService.cpp
S3DRenderer.hpp
S3DRenderer.cpp
gui/Scenery3dDialog.hpp gui/Scenery3dDialog.hpp
gui/Scenery3dDialog_p.hpp gui/Scenery3dDialog_p.hpp
gui/Scenery3dDialog.cpp gui/Scenery3dDialog.cpp
gui/StoredViewDialog.hpp gui/StoredViewDialog.hpp
gui/StoredViewDialog_p.hpp gui/StoredViewDialog_p.hpp
gui/StoredViewDialog.cpp gui/StoredViewDialog.cpp
ShaderManager.hpp ShaderManager.hpp
ShaderManager.cpp ShaderManager.cpp
OBJ.hpp
OBJ.cpp
Heightmap.hpp Heightmap.hpp
Heightmap.cpp Heightmap.cpp
) )
# CMake < 3.0 does not AUTOMOC Q_GADGET which S3DEnum.hpp uses, so we have to manually add it # CMake < 3.0 does not AUTOMOC Q_GADGET which S3DEnum.hpp uses, so we have to manually add it
# Wrap it in an IF to prevent some linker warnings about symbols defined tw ice (on MSVC13 at least) # Wrap it in an IF to prevent some linker warnings about symbols defined tw ice (on MSVC13 at least)
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0) IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)
QT5_WRAP_CPP(Scenery3d_MOC_SRCS S3DEnum.hpp) QT5_WRAP_CPP(Scenery3d_MOC_SRCS S3DEnum.hpp)
ENDIF() ENDIF()
 End of changes. 5 change blocks. 
8 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/