fix core api header

jef-n · jef-n · commit 43c046b264ea · 2015-10-12T20:52:52.000+02:00
diff --git a/src/auth/basic/CMakeLists.txt b/src/auth/basic/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(AUTH_BASIC_UIS qgsauthbasicedit.ui)
 INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
+  ../../core/geometry
   ${QCA_INCLUDE_DIR}
   ../../gui
   ../../gui/auth
diff --git a/src/auth/identcert/CMakeLists.txt b/src/auth/identcert/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(AUTH_IDENTCERT_UIS qgsauthidentcertedit.ui)
 INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
+  ../../core/geometry
   ${QCA_INCLUDE_DIR}
   ../../gui
   ../../gui/auth
diff --git a/src/auth/pkipaths/CMakeLists.txt b/src/auth/pkipaths/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(AUTH_PKIPATHS_UIS qgsauthpkipathsedit.ui)
 INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
+  ../../core/geometry
   ${QCA_INCLUDE_DIR}
   ../../gui
   ../../gui/auth
diff --git a/src/auth/pkipkcs12/CMakeLists.txt b/src/auth/pkipkcs12/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(AUTH_PKCS12_UIS qgsauthpkcs12edit.ui)
 INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
+  ../../core/geometry
   ${QCA_INCLUDE_DIR}
   ../../gui
   ../../gui/auth
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -27,7 +27,8 @@
 #include <cfloat>
 #include <cmath>
 #include <qnumeric.h>
-#include "geometry/qgswkbtypes.h"
+
+#include <qgswkbtypes.h>
 
 /** \ingroup core
  * The QGis class provides global constants for use throughout the application.
diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -2,6 +2,7 @@ ADD_EXECUTABLE(crssync main.cpp)
 
 INCLUDE_DIRECTORIES(
   ../core
+  ../core/geometry
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
 )
diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -54,6 +54,7 @@ ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HE
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../core
+  ${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
   ${CMAKE_CURRENT_BINARY_DIR}
   ${SQLITE3_INCLUDE_DIR}
 )
diff --git a/src/providers/gdal/CMakeLists.txt b/src/providers/gdal/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(GDAL_MOC_HDRS
 INCLUDE_DIRECTORIES (
   ../../core
   ../../core/raster
+  ../../core/geometry
   ../../gui
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui
   ${GDAL_INCLUDE_DIR}
diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(OWS_MOC_HDRS
 
 INCLUDE_DIRECTORIES (
   ../../core
+  ../../core/geometry
   ../../core/auth
   ../../gui
   ../../gui/auth
diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt
@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(
   ../../core
   ../../core/auth
   ../../core/raster
+  ../../core/geometry
   ../../gui
   ../../gui/auth
   ../gdal
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
 
 INCLUDE_DIRECTORIES(
   ../core
+  ../core/geometry
   ../core/raster
   ../gui
   ${PYTHON_INCLUDE_PATH}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ ADD_EXECUTABLE(crssync main.cpp)`
`2`	`2`
`3`	`3`	`INCLUDE_DIRECTORIES(`
`4`	`4`	`../core`
	`5`	`+ ../core/geometry`
`5`	`6`	`${GDAL_INCLUDE_DIR}`
`6`	`7`	`${PROJ_INCLUDE_DIR}`
`7`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HE`
`54`	`54`
`55`	`55`	`INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}`
`56`	`56`	`${CMAKE_CURRENT_SOURCE_DIR}/../core`
	`57`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry`
`57`	`58`	`${CMAKE_CURRENT_BINARY_DIR}`
`58`	`59`	`${SQLITE3_INCLUDE_DIR}`
`59`	`60`	`)`