Skip to content
Permalink
Browse files

Fix windows build

  • Loading branch information
jef-n committed Oct 31, 2020
1 parent 7ab1f19 commit 9e04323351958e6b1ff6f653d8f1d1099d221473
Showing with 5 additions and 4 deletions.
  1. +1 −1 src/app/CMakeLists.txt
  2. +4 −2 tests/src/3d/sandbox/CMakeLists.txt
  3. +0 −1 tests/src/3d/sandbox/qgis_3d_sandbox.cpp
@@ -385,7 +385,7 @@ IF(PEDANTIC)
SET_SOURCE_FILES_PROPERTIES(
qgisappinterface.cpp
${CMAKE_BINARY_DIR}/src/app/moc_qgisappinterface.cxx
PROPERTIES COMPILE_FLAGS "/wd4996"
PROPERTIES COMPILE_FLAGS "/wd4996"
)
ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(
@@ -1,3 +1,6 @@
IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
ENDIF(WIN32)

INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/external
@@ -36,15 +39,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/app/3d
${CMAKE_BINARY_DIR}/src/app
${QWT_INCLUDE_DIR}
#${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1
)

INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${QT5_3DEXTRA_INCLUDE_DIR}
)


ADD_EXECUTABLE(qgis_3d_sandbox
qgis_3d_sandbox.cpp
${CMAKE_SOURCE_DIR}/src/app/3d/qgs3dmapcanvas.cpp
@@ -30,7 +30,6 @@
#include "qgs3dmapsettings.h"
#include "qgs3dmapcanvas.h"


void initCanvas3D( Qgs3DMapCanvas *canvas )
{
QgsLayerTree *root = QgsProject::instance()->layerTreeRoot();

0 comments on commit 9e04323

Please sign in to comment.
You can’t perform that action at this time.