[Liblas-commits] libpc: ignore Makefiles
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Mar 15 14:18:31 EDT 2011
details: http://hg.liblas.orglibpc/rev/23a91d0c05eb
changeset: 236:23a91d0c05eb
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Mar 15 13:17:25 2011 -0500
description:
ignore Makefiles
Subject: libpc: rename chipper.cpp to Chipper.cpp to match naming styles
details: http://hg.liblas.orglibpc/rev/ca4739f798dc
changeset: 237:ca4739f798dc
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Mar 15 13:17:45 2011 -0500
description:
rename chipper.cpp to Chipper.cpp to match naming styles
Subject: libpc: merge
details: http://hg.liblas.orglibpc/rev/8ee844afafd4
changeset: 238:8ee844afafd4
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Mar 15 13:18:20 2011 -0500
description:
merge
diffstat:
.hgignore | 2 +
CMakeLists.txt | 20 +-
cmake/libPC.vcproj.user.template | 121 ------------
cmake/modules/FindGDAL.cmake | 4 +-
cmake/modules/FindGeoTIFF.cmake | 4 +-
cmake/modules/FindLASzip.cmake | 4 +-
cmake/modules/FindLibLAS.cmake | 16 +-
csharp/CMakeLists.txt | 1 +
include/libpc/Chipper.hpp | 142 ++++++++++++++
include/libpc/chipper.hpp | 142 --------------
mpg-config.bat | 10 +-
src/CMakeLists.txt | 2 +-
src/Chipper.cpp | 390 +++++++++++++++++++++++++++++++++++++++
src/chipper.cpp | 390 ---------------------------------------
14 files changed, 574 insertions(+), 674 deletions(-)
diffs (truncated from 1398 to 300 lines):
diff -r c4371adc6197 -r 8ee844afafd4 .hgignore
--- a/.hgignore Mon Mar 14 14:08:54 2011 -0500
+++ b/.hgignore Tue Mar 15 13:18:20 2011 -0500
@@ -32,3 +32,5 @@
# generated swig files
csharp/libpc_swig_cs/*.cs
csharp/libpc_swig_cpp/libpc_wrap.cpp
+
+Makefile
diff -r c4371adc6197 -r 8ee844afafd4 CMakeLists.txt
--- a/CMakeLists.txt Mon Mar 14 14:08:54 2011 -0500
+++ b/CMakeLists.txt Tue Mar 15 13:18:20 2011 -0500
@@ -178,7 +178,7 @@
endif(WIN32)
# BUG: are there other Boost components we're using?
-find_package(Boost 1.45 COMPONENTS program_options thread iostreams filesystem system unit_test_framework REQUIRED)
+find_package(Boost 1.44 COMPONENTS program_options thread iostreams filesystem system unit_test_framework REQUIRED)
if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
@@ -245,6 +245,24 @@
# settings for other 3rd party dependencies
#------------------------------------------------------------------------------
+# swig support
+if (WIN32)
+ set(WITH_SWIG_CSHARP TRUE CACHE BOOL "Choose if you want to make C# bindings via Swig")
+else()
+ set(WITH_SWIG_CSHARP FALSE CACHE BOOL "Choose if you want to make C# bindings via Swig")
+endif()
+
+if(WITH_SWIG_CSHARP)
+ find_package(swig 2.0.1)
+ if(SWIG_FOUND)
+ add_subdirectory(csharp)
+ set(LIBPC_HAVE_SWIG_CSHARP 1)
+ message(STATUS "Found Swig version ${SWIG_VERSION}")
+ else()
+ message(FATAL_ERROR "Swig not found (required for C# bindings)")
+ endif()
+endif()
+
# libxml2 support - optional, default=ON
set(WITH_LIBXML2 FALSE CACHE BOOL "Choose if libxml2 support should be built ")
diff -r c4371adc6197 -r 8ee844afafd4 cmake/libPC.vcproj.user.template
--- a/cmake/libPC.vcproj.user.template Mon Mar 14 14:08:54 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
- ProjectType="Visual C++"
- Version="9.00"
- ShowAllFiles="false"
- >
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="DEV410"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="DEV410"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="MinSizeRel|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="DEV410"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="RelWithDebInfo|Win32"
- >
- <DebugSettings
- Command="$(TargetPath)"
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="DEV410"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
- EnvironmentMerge="true"
- DebuggerFlavor="0"
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- </Configurations>
-</VisualStudioUserFile>
\ No newline at end of file
diff -r c4371adc6197 -r 8ee844afafd4 cmake/modules/FindGDAL.cmake
--- a/cmake/modules/FindGDAL.cmake Mon Mar 14 14:08:54 2011 -0500
+++ b/cmake/modules/FindGDAL.cmake Tue Mar 15 13:18:20 2011 -0500
@@ -23,10 +23,10 @@
SET(OSGEO4W_IMPORT_LIBRARY gdal_i)
IF(DEFINED ENV{OSGEO4W_ROOT})
SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
- MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+ #MESSAGE(STATUS " FindGDAL: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
ELSE()
SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
- MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+ #MESSAGE(STATUS " FindGDAL: trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
ENDIF()
IF(MINGW)
diff -r c4371adc6197 -r 8ee844afafd4 cmake/modules/FindGeoTIFF.cmake
--- a/cmake/modules/FindGeoTIFF.cmake Mon Mar 14 14:08:54 2011 -0500
+++ b/cmake/modules/FindGeoTIFF.cmake Tue Mar 15 13:18:20 2011 -0500
@@ -29,10 +29,10 @@
SET(OSGEO4W_IMPORT_LIBRARY geotiff_i)
IF(DEFINED ENV{OSGEO4W_ROOT})
SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
- MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+ #MESSAGE(STATUS " FindGeoTIFF: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
ELSE()
SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
- MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+ #MESSAGE(STATUS " FindGeoTIFF: trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
ENDIF()
ENDIF()
diff -r c4371adc6197 -r 8ee844afafd4 cmake/modules/FindLASzip.cmake
--- a/cmake/modules/FindLASzip.cmake Mon Mar 14 14:08:54 2011 -0500
+++ b/cmake/modules/FindLASzip.cmake Tue Mar 15 13:18:20 2011 -0500
@@ -29,10 +29,10 @@
SET(OSGEO4W_IMPORT_LIBRARY laszip)
IF(DEFINED ENV{OSGEO4W_ROOT})
SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
- MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+ #MESSAGE(STATUS " FindLASzip: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
ELSE()
SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
- MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+ #MESSAGE(STATUS " FindLASzip: trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
ENDIF()
ENDIF()
diff -r c4371adc6197 -r 8ee844afafd4 cmake/modules/FindLibLAS.cmake
--- a/cmake/modules/FindLibLAS.cmake Mon Mar 14 14:08:54 2011 -0500
+++ b/cmake/modules/FindLibLAS.cmake Tue Mar 15 13:18:20 2011 -0500
@@ -18,7 +18,7 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
###############################################################################
-MESSAGE(STATUS "Searching for libPC ${LibPC_FIND_VERSION}+ library")
+MESSAGE(STATUS "Searching for LibLAS ${LibLAS_FIND_VERSION}+ library")
IF(LIBLAS_INCLUDE_DIR)
# Already in cache, be silent
@@ -29,10 +29,10 @@
SET(OSGEO4W_IMPORT_LIBRARY liblas)
IF(DEFINED ENV{OSGEO4W_ROOT})
SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
- MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+ #MESSAGE(STATUS " FindLibLAS: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
ELSE()
SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
- MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+ #MESSAGE(STATUS " FindLibLAS: trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
ENDIF()
ENDIF()
@@ -79,13 +79,13 @@
#message(FATAL_ERROR "${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_PATCH}")
if(NOT ${LIBLAS_VERSION_MAJOR} MATCHES "[0-9]+")
- message(FATAL_ERROR "libPC version parsing failed for LIBLAS_VERSION_MAJOR!")
+ message(FATAL_ERROR "libLAS version parsing failed for LIBLAS_VERSION_MAJOR!")
endif()
if(NOT ${LIBLAS_VERSION_MINOR} MATCHES "[0-9]+")
- message(FATAL_ERROR "libPC version parsing failed for LIBLAS_VERSION_MINOR!")
+ message(FATAL_ERROR "libLAS version parsing failed for LIBLAS_VERSION_MINOR!")
endif()
if(NOT ${LIBLAS_VERSION_PATCH} MATCHES "[0-9]+")
- message(FATAL_ERROR "libPC version parsing failed for LIBLAS_VERSION_PATCH!")
+ message(FATAL_ERROR "libLAS version parsing failed for LIBLAS_VERSION_PATCH!")
endif()
@@ -94,9 +94,9 @@
IF (LIBLAS_VERSION VERSION_EQUAL LibLAS_FIND_VERSION OR
LIBLAS_VERSION VERSION_GREATER LibLAS_FIND_VERSION)
- MESSAGE(STATUS "Found libPC version: ${LIBLAS_VERSION}")
+ MESSAGE(STATUS "Found libLAS version: ${LIBLAS_VERSION}")
ELSE()
- MESSAGE(FATAL_ERROR "libPC version check failed. Version ${LIBLAS_VERSION} was found, at least version ${LibLAS_FIND_VERSION} is required")
+ MESSAGE(FATAL_ERROR "libLS version check failed. Version ${LIBLAS_VERSION} was found, at least version ${LibLAS_FIND_VERSION} is required")
ENDIF()
ELSE()
MESSAGE(FATAL_ERROR "Failed to open ${LIBLAS_VERSION_H} file")
diff -r c4371adc6197 -r 8ee844afafd4 csharp/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/csharp/CMakeLists.txt Tue Mar 15 13:18:20 2011 -0500
@@ -0,0 +1,1 @@
+
diff -r c4371adc6197 -r 8ee844afafd4 include/libpc/Chipper.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/libpc/Chipper.hpp Tue Mar 15 13:18:20 2011 -0500
@@ -0,0 +1,142 @@
+#ifndef LIBLAS_CHIPPER_H
+#define LIBLAS_CHIPPER_H
+
+#include <libpc/Stage.hpp>
+#include <libpc/Bounds.hpp>
+#include <libpc/export.hpp>
+#include <libpc/Dimension.hpp>
+
+#include <vector>
+
+namespace libpc
+{
+
+namespace chipper
+{
+
+enum Direction
More information about the Liblas-commits
mailing list