Revision: 77623
http://sourceforge.net/p/brlcad/code/77623
Author: starseeker
Date: 2020-10-24 00:51:52 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
fix include dirs for gdal, few other gdal related adjustments
Modified Paths:
--------------
brlcad/branches/extbuild/src/libgcv/plugins/gdal/CMakeLists.txt
brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal.cpp
brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal_ll.cpp
brlcad/branches/extbuild/src/other/ext/gdal.cmake
Modified: brlcad/branches/extbuild/src/libgcv/plugins/gdal/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libgcv/plugins/gdal/CMakeLists.txt
2020-10-23 22:10:05 UTC (rev 77622)
+++ brlcad/branches/extbuild/src/libgcv/plugins/gdal/CMakeLists.txt
2020-10-24 00:51:52 UTC (rev 77623)
@@ -1,6 +1,6 @@
if(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
- include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
- LIBGCV_ADD_PLUGIN(gdal "gdal.cpp;gdal_ll.cpp" "librt;libbu;${GDAL_LIBRARY}")
+ include_directories(SYSTEM ${GDAL_INCLUDE_DIRS})
+ LIBGCV_ADD_PLUGIN(gdal "gdal.cpp;gdal_ll.cpp"
"librt;libbu;${GDAL_LIBRARIES}")
endif(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
CMAKEFILES(gdal.cpp)
Modified: brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal.cpp
===================================================================
--- brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal.cpp 2020-10-23
22:10:05 UTC (rev 77622)
+++ brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal.cpp 2020-10-24
00:51:52 UTC (rev 77623)
@@ -42,13 +42,13 @@
#include <stdexcept>
/* GDAL headers */
-#include <gdal.h>
-#include <gdalwarper.h>
-#include <gdal_utils.h>
-#include <cpl_conv.h>
-#include <cpl_string.h>
-#include <cpl_multiproc.h>
-#include <ogr_spatialref.h>
+#include "gdal.h"
+#include "gdalwarper.h"
+#include "gdal_utils.h"
+#include "cpl_conv.h"
+#include "cpl_string.h"
+#include "cpl_multiproc.h"
+#include "ogr_spatialref.h"
#include "vrtdataset.h"
#include "bu/app.h"
Modified: brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal_ll.cpp
===================================================================
--- brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal_ll.cpp
2020-10-23 22:10:05 UTC (rev 77622)
+++ brlcad/branches/extbuild/src/libgcv/plugins/gdal/gdal_ll.cpp
2020-10-24 00:51:52 UTC (rev 77623)
@@ -27,13 +27,13 @@
#include "common.h"
/* GDAL headers */
-#include <gdal.h>
-#include <gdalwarper.h>
-#include <gdal_utils.h>
-#include <cpl_conv.h>
-#include <cpl_string.h>
-#include <cpl_multiproc.h>
-#include <ogr_spatialref.h>
+#include "gdal.h"
+#include "gdalwarper.h"
+#include "gdal_utils.h"
+#include "cpl_conv.h"
+#include "cpl_string.h"
+#include "cpl_multiproc.h"
+#include "ogr_spatialref.h"
#include "vrtdataset.h"
#include "bu/log.h"
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-23 22:10:05 UTC
(rev 77622)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-24 00:51:52 UTC
(rev 77623)
@@ -179,14 +179,14 @@
set(GDAL_INCLUDE_DIR
"${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/gdal"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/port"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/gcore"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/alg"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/ogr"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/ogr/ogrsf_frmts"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/gnm"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/apps"
- "${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/frmts/vrt"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/port"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/gcore"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/alg"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/ogr"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/ogr/ogrsf_frmts"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/gnm"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/apps"
+ "${BRLCAD_SOURCE_DIR}/src/other/ext/gdal/frmts/vrt"
CACHE STRING "Directories containing GDAL headers." FORCE)
set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}" CACHE STRING "Directories
containing GDAL headers." FORCE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
