dakcarto

diff --git a/src/modules_io/grid/io_grid/xyz.cpp b/src/modules_io/grid/io_grid/xyz.cpp
index 9b6dc3b..3efdaa1 100644
--- a/src/modules_io/grid/io_grid/xyz.cpp
+++ b/src/modules_io/grid/io_grid/xyz.cpp
@@ -173,6 +173,10 @@ bool CXYZ_Export::On_Execute(void)
 	return( false );
 }
 
+//---------------------------------------------------------
+CXYZ_Export::~CXYZ_Export(void)

dakcarto

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
index 607bd68..5b38a39 100644
--- a/cmake_templates/qgsconfig.h.in
+++ b/cmake_templates/qgsconfig.h.in
@@ -30,6 +30,7 @@
 
 #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
 //used by Mac to find system Qt plugins when bundle is run from build directory
+#define QGIS_MACAPP_BUNDLE ${QGIS_MACAPP_BUNDLE}
 #define QTPLUGINSDIR "${QT_PLUGINS_DIR}"

dakcarto

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
index 393471c..bdc2665 100644
--- a/src/python/qgspythonutilsimpl.cpp
+++ b/src/python/qgspythonutilsimpl.cpp
@@ -61,6 +61,14 @@ void QgsPythonUtilsImpl::initPython( QgisInterface* interface )
   runString( "import sys" ); // import sys module (for display / exception hooks)
   runString( "import os" ); // import os module (for user paths)
 
+  // support for PYTHONSTARTUP-like environment variable: PYQGIS_STARTUP
+  // (unlike PYTHONHOME and PYTHONPATH, PYTHONSTARTUP is not supported for embedded interpreter by default)

dakcarto

Thu Jan 30 14:08:30 | MacBook Pro @ /Volumes/Scratch/osgeo4mac-tmp/pdal-WGI0/PDAL-0.9.8/build
$ ctest -VV .
UpdateCTestConfiguration  from :/Volumes/Scratch/osgeo4mac-tmp/pdal-WGI0/PDAL-0.9.8/build/DartConfiguration.tcl
UpdateCTestConfiguration  from :/Volumes/Scratch/osgeo4mac-tmp/pdal-WGI0/PDAL-0.9.8/build/DartConfiguration.tcl
Test project /Volumes/Scratch/osgeo4mac-tmp/pdal-WGI0/PDAL-0.9.8/build
Constructing a list of tests
Done constructing a list of tests
Checking test dependency graph...
Checking test dependency graph end
test 1

dakcarto

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index efdc796..4f19010 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,11 +1,12 @@
 if (SWIG_FOUND)
     find_package(PythonLibs)
     include_directories(${PYTHON_INCLUDE_PATH})
+    include_directories("${PDAL_SOURCE_DIR}/include")
     set_source_files_properties(pdal.i PROPERTIES CPLUSPLUS ON)

dakcarto

[ 59%] Building CXX object src/CMakeFiles/pdalcpp.dir/drivers/mrsid/Reader.cpp.o
cd /Volumes/Scratch/osgeo4mac-tmp/pdal-sAvV/build/src && /usr/local/Library/ENV/4.3/clang++   
-DBOOST_ALL_NO_LIB -DHAVE_HEXER=1 -DHAVE_MRSID=1 -DHAVE_P2G=1 -DHAVE_PYTHON=1 -Dpdalcpp_EXPORTS 
-Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual 
-Wfloat-equal -Wredundant-decls -Wno-long-long -fPIC -I/Volumes/Scratch/osgeo4mac-tmp/pdal-sAvV/boost 
-I/Volumes/Scratch/osgeo4mac-tmp/pdal-sAvV/build/include -I/Volumes/Scratch/osgeo4mac-tmp/pdal-sAvV/src/../include 
-I/usr/local/include -I/usr/local/include/soci -I/usr/local/opt/sqlite/include -I/usr/local/opt/libxml2/include/libxml2 
-I/usr/local/opt/mrsid-sdk/include -isystem /usr/local/Frameworks/Python.framework/Headers 
-isystem /Library/Python/2.7/site-packages/numpy-override/numpy/core/include -F/usr/local/Frameworks    
-o CMakeFiles/pdalcpp.dir/drivers/mrsid/Reader.cpp.o 

dakcarto

require 'formula'

class Points2grid < Formula
  homepage 'https://github.com/CRREL/points2grid'
  url 'https://github.com/CRREL/points2grid/archive/1.1.0.tar.gz'
  sha1 'aef7e124b47022bee85bb3585f5996af5cb132e3'

  depends_on 'cmake' => :build
  depends_on 'boost'

dakcarto

diff --git a/Modules/CMakeFindJavaCommon.cmake b/Modules/CMakeFindJavaCommon.cmake
index fcf0389..bd515bd 100644
--- a/Modules/CMakeFindJavaCommon.cmake
+++ b/Modules/CMakeFindJavaCommon.cmake
@@ -39,3 +39,13 @@ else()
   endif()
   unset(_ENV_JAVA_HOME)
 endif()
+
+set(_JAVA_HOME_FW 0)

dakcarto

==> Checking out revision bfdf976445582ccdc27a1a6ab1ee5ccd68988759
git checkout-index -a -f --prefix=/Volumes/Scratch/osgeo4mac-tmp/pdal-DFeu/
/usr/local/Library/Taps/dakcarto-osgeo4mac/Formula/pdal.rb: loading /usr/local/Library/Formula/python.rb
==> cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/pdal/1.0.0-bfdf976 -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON -Wno-dev -DPDAL_EMBED_BOOST=FALSE -DWITH_PKGCONFIG=TRUE -DWITH_NITRO=FALSE -DPYTHON_INCLUDE_DIR=/usr/local/Frameworks/Python.framework/Headers -DPYTHON_LIBRARY=/usr/local/Frameworks/Python.framework/Python -DWITH_SWIG_PYTHON=TRUE -DWITH_P2G=TRUE -DWITH_HEXER=TRUE -DWITH_SQLITE=TRUE -DWITH_MRSID=TRUE -DMRSID_ROOT=/usr/local/opt/mrsid-sdk -DWITH_ORACLE=FALSE
-- The C compiler identification is Clang 5.0.0
-- The CXX compiler identification is Clang 5.0.0
-- Check for working C compiler: /usr/local/Library/ENV/4.3/clang
-- Check for working C compiler: /usr/local/Library/ENV/4.3/clang -- works
-- Detecting C compiler A

dakcarto

Linking CXX executable ../bin/pdal
cd /Volumes/Scratch/osgeo4mac-tmp/pdal-GAYU/build/apps && /usr/local/Cellar/cmake/2.8.12.1/bin/cmake -E cmake_link_script CMakeFiles/pdal.dir/link.txt --verbose=1
/usr/local/Library/ENV/4.3/clang++    -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -Wl,-search_paths_first -Wl,-headerpad_max_install_names   CMakeFiles/pdal.dir/pdal.cpp.o  -o ../bin/pdal  ../lib/libpdalcpp.0.dylib /usr/local/lib/libpq.dylib /usr/local/lib/liblaszip.dylib /usr/local/Frameworks/Python.framework/Python /usr/local/lib/libtiff.dylib /usr/local/lib/libgeotiff.dylib /usr/local/Cellar/gdal/1.10.1/lib/libgdal.dylib /usr/local/opt/libxml2/lib/libxml2.dylib /usr/local/lib/libpts2grd.dylib /usr/local/Cellar/geos/3.4.2/lib/libgeos_c.dylib /usr/local/lib/libhexer.dylib 
Undefined symbols for architecture x86_64:
  "boost::program_options::to_internal(std::__1::basic_string<char, std::__1::char_traits<char>, std: