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.hpp
AABB.cpp AABB.cpp
Frustum.hpp Frustum.hpp
Frustum.cpp Frustum.cpp
GLFuncs.hpp GLFuncs.hpp
Line.hpp Line.hpp
Line.cpp 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
Scenery3d.hpp Scenery3d.hpp
Scenery3d.cpp Scenery3d.cpp
Scenery3dMgr.hpp Scenery3dMgr.hpp
Scenery3dMgr.cpp Scenery3dMgr.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.hpp
OBJ.cpp 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()
################# compiles resources files ############ ################# compiles resources files ############
SET(Scenery3d_RES ../resources/Scenery3d.qrc) SET(Scenery3d_RES ../resources/Scenery3d.qrc)
QT5_ADD_RESOURCES(Scenery3d_RES_CXX ${Scenery3d_RES}) QT5_ADD_RESOURCES(Scenery3d_RES_CXX ${Scenery3d_RES})
################# compiles .ui files ############ ################# compiles .ui files ############
SET(Scenery3d_UIS SET(Scenery3d_UIS
gui/scenery3dDialog.ui gui/scenery3dDialog.ui
gui/storedViewDialog.ui gui/storedViewDialog.ui
) )
QT5_WRAP_UI(Scenery3d_UIS_H ${Scenery3d_UIS}) QT5_WRAP_UI(Scenery3d_UIS_H ${Scenery3d_UIS})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${O PENGL_LIBRARIES} ) SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${O PENGL_LIBRARIES} )
############### For building the static library ###################### ############### For building the static library ######################
ADD_LIBRARY(Scenery3d-static STATIC ${Scenery3d_SRCS} ${Scenery3d_RES_CXX} ${Scenery3d_UIS_H} ${Scenery3d_MOC_SRCS} ) ADD_LIBRARY(Scenery3d-static STATIC ${Scenery3d_SRCS} ${Scenery3d_RES_CXX} ${Scenery3d_UIS_H} ${Scenery3d_MOC_SRCS} )
QT5_USE_MODULES(Scenery3d-static Core Concurrent Gui Widgets) QT5_USE_MODULES(Scenery3d-static Core Concurrent Gui Widgets)
SET_TARGET_PROPERTIES(Scenery3d-static PROPERTIES OUTPUT_NAME "Scenery3d") SET_TARGET_PROPERTIES(Scenery3d-static PROPERTIES OUTPUT_NAME "Scenery3d")
TARGET_LINK_LIBRARIES(Scenery3d-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(Scenery3d-static ${extLinkerOption})
 End of changes. 4 change blocks. 
39 lines changed or deleted 39 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/