[Liblas-commits] hg-main-tree: don't upper case the
point_schema_override
liblas-commits at liblas.org
liblas-commits at liblas.org
Thu Jun 16 11:54:54 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/ab6e73b35b19
changeset: 791:ab6e73b35b19
user: Howard Butler <hobu.inc at gmail.com>
date: Tue May 17 17:57:44 2011 -0500
description:
don't upper case the point_schema_override
Subject: hg-main-tree: merge
details: http://hg.libpc.orghg-main-tree/rev/a06d0eb62042
changeset: 792:a06d0eb62042
user: Howard Butler <hobu.inc at gmail.com>
date: Thu Jun 16 10:54:47 2011 -0500
description:
merge
diffstat:
AUTHORS.txt | 2 +-
CMakeLists.txt | 145 ++--
LICENSE.txt | 6 +-
apps/Application.cpp | 10 +-
apps/Application.hpp | 4 +-
apps/CMakeLists.txt | 40 +-
apps/libpc-config.in | 63 --
apps/pc2pc.cpp | 96 +-
apps/pcinfo.cpp | 22 +-
apps/pcview/ArcBall.cpp | 4 +-
apps/pcview/CMakeLists.txt | 8 +-
apps/pcview/Engine.cpp | 6 +-
apps/pcview/main.cpp | 66 +-
apps/pdal-config.in | 63 ++
astylerc | 2 +-
csharp/CMakeLists.txt | 2 +-
csharp/PCView/PCView.csproj | 4 +-
csharp/README.txt | 22 +-
csharp/libpc_swig.sln | 6 +-
csharp/libpc_swig_cpp/libpc.i | 42 +-
csharp/libpc_swig_cpp/libpc_swig_cpp.vcxproj | 40 +-
csharp/libpc_swig_cs/libpc_swig_cs.csproj | 8 +-
csharp/libpc_swig_test/Program.cs | 2 +-
csharp/libpc_swig_test/TestDimension.cs | 2 +-
csharp/libpc_swig_test/TestLiblasReader.cs | 2 +-
csharp/libpc_swig_test/libpc_swig_test.csproj | 2 +-
doc/Makefile | 8 +-
doc/conf.py | 12 +-
doc/index.txt | 4 +-
doc/make.bat | 4 +-
doc/notes/apps.txt | 6 +-
doc/notes/coding-conventions.txt | 18 +-
doc/notes/core-classes.txt | 2 +-
doc/notes/docs.txt | 2 +-
doc/notes/future.txt | 2 +-
doc/notes/goals.txt | 16 +-
doc/notes/intro.txt | 6 +-
doc/notes/io.txt | 8 +-
doc/notes/misc.txt | 22 +-
doc/notes/pipeline.txt | 8 +-
doc/notes/stages.txt | 4 +-
doc/notes/use-cases.txt | 6 +-
include/libpc/Bounds.hpp | 456 ----------------
include/libpc/Color.hpp | 155 -----
include/libpc/Dimension.hpp | 312 -----------
include/libpc/DimensionLayout.hpp | 117 ----
include/libpc/Filter.hpp | 62 --
include/libpc/FilterIterator.hpp | 107 ---
include/libpc/Iterator.hpp | 160 -----
include/libpc/MetadataRecord.hpp | 73 --
include/libpc/Options.hpp | 100 ---
include/libpc/PointBuffer.hpp | 199 -------
include/libpc/PointBufferCache.hpp | 201 -------
include/libpc/Range.hpp | 205 -------
include/libpc/Schema.hpp | 114 ----
include/libpc/SchemaLayout.hpp | 110 ----
include/libpc/Signaller.hpp | 74 --
include/libpc/SpatialReference.hpp | 117 ----
include/libpc/Stage.hpp | 119 ----
include/libpc/Utils.hpp | 216 -------
include/libpc/Vector.hpp | 196 -------
include/libpc/Writer.hpp | 91 ---
include/libpc/XMLSchema.hpp | 161 -----
include/libpc/drivers/faux/Iterator.hpp | 79 --
include/libpc/drivers/faux/Reader.hpp | 111 ----
include/libpc/drivers/faux/Writer.hpp | 94 ---
include/libpc/drivers/las/Header.hpp | 385 --------------
include/libpc/drivers/las/Iterator.hpp | 102 ---
include/libpc/drivers/las/Reader.hpp | 112 ----
include/libpc/drivers/las/ReaderBase.hpp | 64 --
include/libpc/drivers/las/SummaryData.hpp | 87 ---
include/libpc/drivers/las/Support.hpp | 107 ---
include/libpc/drivers/las/VariableLengthRecord.hpp | 132 ----
include/libpc/drivers/las/Writer.hpp | 105 ---
include/libpc/drivers/liblas/Iterator.hpp | 108 ---
include/libpc/drivers/liblas/Reader.hpp | 117 ----
include/libpc/drivers/liblas/Writer.hpp | 102 ---
include/libpc/drivers/mrsid/Reader.hpp | 86 ---
include/libpc/drivers/oci/Common.hpp | 190 ------
include/libpc/drivers/oci/Endian.hpp | 71 --
include/libpc/drivers/oci/Iterator.hpp | 94 ---
include/libpc/drivers/oci/Reader.hpp | 107 ---
include/libpc/drivers/oci/Writer.hpp | 126 ----
include/libpc/drivers/oci/oci_wrapper.h | 474 -----------------
include/libpc/drivers/qfit/Iterator.hpp | 80 --
include/libpc/drivers/qfit/Reader.hpp | 173 ------
include/libpc/drivers/terrasolid/Iterator.hpp | 80 --
include/libpc/drivers/terrasolid/Reader.hpp | 186 ------
include/libpc/exceptions.hpp | 154 -----
include/libpc/export.hpp | 62 --
include/libpc/filters/CacheFilter.hpp | 124 ----
include/libpc/filters/CacheFilterIterator.hpp | 78 --
include/libpc/filters/Chipper.hpp | 210 -------
include/libpc/filters/ChipperIterator.hpp | 70 --
include/libpc/filters/ColorFilter.hpp | 89 ---
include/libpc/filters/ColorFilterIterator.hpp | 62 --
include/libpc/filters/CropFilter.hpp | 89 ---
include/libpc/filters/CropFilterIterator.hpp | 64 --
include/libpc/filters/DecimationFilter.hpp | 85 ---
include/libpc/filters/DecimationFilterIterator.hpp | 64 --
include/libpc/filters/MosaicFilter.hpp | 84 ---
include/libpc/filters/MosaicFilterIterator.hpp | 70 --
include/libpc/filters/ReprojectionFilter.hpp | 97 ---
include/libpc/filters/ReprojectionFilterIterator.hpp | 62 --
include/libpc/filters/ScalingFilter.hpp | 97 ---
include/libpc/filters/ScalingFilterIterator.hpp | 62 --
include/libpc/libpc.hpp | 56 --
include/libpc/libpc_config.hpp | 68 --
include/libpc/types.hpp | 65 --
include/pdal/Bounds.hpp | 456 ++++++++++++++++
include/pdal/Color.hpp | 155 +++++
include/pdal/Dimension.hpp | 312 +++++++++++
include/pdal/DimensionLayout.hpp | 117 ++++
include/pdal/Endian.hpp | 111 ++++
include/pdal/Filter.hpp | 62 ++
include/pdal/FilterIterator.hpp | 107 +++
include/pdal/Iterator.hpp | 160 +++++
include/pdal/MetadataRecord.hpp | 73 ++
include/pdal/Options.hpp | 100 +++
include/pdal/PointBuffer.hpp | 218 ++++++++
include/pdal/PointBufferCache.hpp | 201 +++++++
include/pdal/Range.hpp | 205 +++++++
include/pdal/Schema.hpp | 115 ++++
include/pdal/SchemaLayout.hpp | 115 ++++
include/pdal/Signaller.hpp | 74 ++
include/pdal/SpatialReference.hpp | 123 ++++
include/pdal/Stage.hpp | 119 ++++
include/pdal/Utils.hpp | 221 ++++++++
include/pdal/Vector.hpp | 196 +++++++
include/pdal/Writer.hpp | 91 +++
include/pdal/XMLSchema.hpp | 213 +++++++
include/pdal/drivers/faux/Iterator.hpp | 79 ++
include/pdal/drivers/faux/Reader.hpp | 111 ++++
include/pdal/drivers/faux/Writer.hpp | 94 +++
include/pdal/drivers/las/Header.hpp | 385 ++++++++++++++
include/pdal/drivers/las/Iterator.hpp | 106 +++
include/pdal/drivers/las/Reader.hpp | 112 ++++
include/pdal/drivers/las/ReaderBase.hpp | 64 ++
include/pdal/drivers/las/SummaryData.hpp | 87 +++
include/pdal/drivers/las/Support.hpp | 107 +++
include/pdal/drivers/las/VariableLengthRecord.hpp | 132 ++++
include/pdal/drivers/las/Writer.hpp | 109 ++++
include/pdal/drivers/liblas/Iterator.hpp | 108 +++
include/pdal/drivers/liblas/Reader.hpp | 117 ++++
include/pdal/drivers/liblas/Writer.hpp | 102 +++
include/pdal/drivers/mrsid/Reader.hpp | 86 +++
include/pdal/drivers/oci/Common.hpp | 184 ++++++
include/pdal/drivers/oci/Iterator.hpp | 96 +++
include/pdal/drivers/oci/Reader.hpp | 107 +++
include/pdal/drivers/oci/Writer.hpp | 126 ++++
include/pdal/drivers/oci/oci_wrapper.h | 473 +++++++++++++++++
include/pdal/drivers/qfit/Iterator.hpp | 80 ++
include/pdal/drivers/qfit/Reader.hpp | 173 ++++++
include/pdal/drivers/terrasolid/Iterator.hpp | 80 ++
include/pdal/drivers/terrasolid/Reader.hpp | 186 ++++++
include/pdal/exceptions.hpp | 154 +++++
include/pdal/export.hpp | 62 ++
include/pdal/filters/ByteSwapFilter.hpp | 88 +++
include/pdal/filters/ByteSwapFilterIterator.hpp | 62 ++
include/pdal/filters/CacheFilter.hpp | 124 ++++
include/pdal/filters/CacheFilterIterator.hpp | 78 ++
include/pdal/filters/Chipper.hpp | 213 +++++++
include/pdal/filters/ChipperIterator.hpp | 70 ++
include/pdal/filters/ColorFilter.hpp | 89 +++
include/pdal/filters/ColorFilterIterator.hpp | 62 ++
include/pdal/filters/CropFilter.hpp | 89 +++
include/pdal/filters/CropFilterIterator.hpp | 64 ++
include/pdal/filters/DecimationFilter.hpp | 85 +++
include/pdal/filters/DecimationFilterIterator.hpp | 64 ++
include/pdal/filters/MosaicFilter.hpp | 84 +++
include/pdal/filters/MosaicFilterIterator.hpp | 70 ++
include/pdal/filters/ReprojectionFilter.hpp | 97 +++
include/pdal/filters/ReprojectionFilterIterator.hpp | 62 ++
include/pdal/filters/ScalingFilter.hpp | 97 +++
include/pdal/filters/ScalingFilterIterator.hpp | 62 ++
include/pdal/pdal.hpp | 56 ++
include/pdal/pdal_config.hpp | 68 ++
include/pdal/types.hpp | 65 ++
libpc_defines.h.in | 70 --
mpg-config.bat | 6 +-
pdal_defines.h.in | 70 ++
python/CMakeLists.txt | 12 +-
python/libpc.i | 12 +-
src/Bounds.cpp | 14 +-
src/CMakeLists.txt | 516 +++++++++---------
src/Color.cpp | 4 +-
src/Dimension.cpp | 64 +-
src/DimensionLayout.cpp | 8 +-
src/Filter.cpp | 6 +-
src/FilterIterator.cpp | 8 +-
src/Iterator.cpp | 10 +-
src/MetadataRecord.cpp | 6 +-
src/Options.cpp | 8 +-
src/PointBuffer.cpp | 10 +-
src/PointBufferCache.cpp | 2 +-
src/Range.cpp | 12 +-
src/Schema.cpp | 58 +-
src/SchemaLayout.cpp | 6 +-
src/Signaller.cpp | 4 +-
src/SpatialReference.cpp | 98 +++-
src/Stage.cpp | 12 +-
src/Utils.cpp | 32 +-
src/Vector.cpp | 2 +-
src/Writer.cpp | 18 +-
src/XMLSchema.cpp | 497 ++++++++++++++----
src/drivers/CMakeLists.txt | 2 +-
src/drivers/faux/Iterator.cpp | 10 +-
src/drivers/faux/Reader.cpp | 22 +-
src/drivers/faux/Writer.cpp | 8 +-
src/drivers/las/GeotiffSupport.cpp | 22 +-
src/drivers/las/GeotiffSupport.hpp | 16 +-
src/drivers/las/Header.cpp | 14 +-
src/drivers/las/Iterator.cpp | 98 ++-
src/drivers/las/LasHeaderReader.cpp | 18 +-
src/drivers/las/LasHeaderReader.hpp | 8 +-
src/drivers/las/LasHeaderWriter.cpp | 6 +-
src/drivers/las/LasHeaderWriter.hpp | 9 +-
src/drivers/las/Reader.cpp | 26 +-
src/drivers/las/SummaryData.cpp | 6 +-
src/drivers/las/Support.cpp | 8 +-
src/drivers/las/VariableLengthRecord.cpp | 13 +-
src/drivers/las/Writer.cpp | 87 +-
src/drivers/las/ZipPoint.cpp | 16 +-
src/drivers/las/ZipPoint.hpp | 4 +-
src/drivers/liblas/Iterator.cpp | 34 +-
src/drivers/liblas/Reader.cpp | 26 +-
src/drivers/liblas/Writer.cpp | 34 +-
src/drivers/mrsid/Reader.cpp | 16 +-
src/drivers/oci/Iterator.cpp | 153 ++++-
src/drivers/oci/Reader.cpp | 255 +++++----
src/drivers/oci/Writer.cpp | 284 ++++++++-
src/drivers/oci/common.cpp | 36 +-
src/drivers/oci/oci_wrapper.cpp | 27 +-
src/drivers/qfit/Iterator.cpp | 16 +-
src/drivers/qfit/Reader.cpp | 24 +-
src/drivers/terrasolid/Iterator.cpp | 16 +-
src/drivers/terrasolid/Reader.cpp | 24 +-
src/filters/ByteSwapFilter.cpp | 152 +++++
src/filters/ByteSwapFilterIterator.cpp | 125 ++++
src/filters/CacheFilter.cpp | 12 +-
src/filters/CacheFilterIterator.cpp | 12 +-
src/filters/Chipper.cpp | 32 +-
src/filters/ChipperIterator.cpp | 82 +--
src/filters/ColorFilter.cpp | 18 +-
src/filters/ColorFilterIterator.cpp | 8 +-
src/filters/CropFilter.cpp | 12 +-
src/filters/CropFilterIterator.cpp | 10 +-
src/filters/DecimationFilter.cpp | 10 +-
src/filters/DecimationFilterIterator.cpp | 10 +-
src/filters/MosaicFilter.cpp | 20 +-
src/filters/MosaicFilterIterator.cpp | 10 +-
src/filters/ReprojectionFilter.cpp | 43 +-
src/filters/ReprojectionFilterIterator.cpp | 8 +-
src/filters/ScalingFilter.cpp | 18 +-
src/filters/ScalingFilterIterator.cpp | 12 +-
src/libpc_config.cpp | 176 ------
src/pdal_config.cpp | 176 ++++++
src/prototype.vcxproj | 30 +-
test/CMakeLists.txt | 2 +-
test/data/epsg_4326.las | 0
test/data/schemas/8-dimension-schema.xml | 2 +-
test/data/schemas/LAS.xsd | 27 +-
test/unit/BoundsTest.cpp | 4 +-
test/unit/ByteSwapFilterTest.cpp | 147 +++++
test/unit/CMakeLists.txt | 63 +-
test/unit/CacheFilterTest.cpp | 16 +-
test/unit/ChipperTest.cpp | 20 +-
test/unit/ColorFilterTest.cpp | 8 +-
test/unit/ColorTest.cpp | 4 +-
test/unit/ConfigTest.cpp | 14 +-
test/unit/CropFilterTest.cpp | 14 +-
test/unit/DecimationFilterTest.cpp | 20 +-
test/unit/DimensionLayoutTest.cpp | 4 +-
test/unit/DimensionTest.cpp | 4 +-
test/unit/FauxReaderTest.cpp | 24 +-
test/unit/FauxWriterTest.cpp | 14 +-
test/unit/LasReaderTest.cpp | 56 +-
test/unit/LasWriterTest.cpp | 28 +-
test/unit/LiblasReaderTest.cpp | 42 +-
test/unit/LiblasWriterTest.cpp | 16 +-
test/unit/MosaicFilterTest.cpp | 20 +-
test/unit/OCITest.cpp | 46 +-
test/unit/PointBufferCacheTest.cpp | 6 +-
test/unit/PointBufferTest.cpp | 6 +-
test/unit/QFITReaderTest.cpp | 36 +-
test/unit/RangeTest.cpp | 6 +-
test/unit/ReprojectionFilterTest.cpp | 96 +-
test/unit/SchemaLayoutTest.cpp | 4 +-
test/unit/SchemaTest.cpp | 4 +-
test/unit/SignallerTest.cpp | 4 +-
test/unit/SpatialReferenceTest.cpp | 149 +++--
test/unit/Support.cpp | 52 +-
test/unit/Support.hpp | 14 +-
test/unit/TerraSolidTest.cpp | 36 +-
test/unit/UtilsTest.cpp | 4 +-
test/unit/VectorTest.cpp | 4 +-
test/unit/XMLSchemaTest.cpp | 65 +-
297 files changed, 12296 insertions(+), 10803 deletions(-)
diffs (truncated from 29322 to 300 lines):
diff -r 47f1757b7ba8 -r a06d0eb62042 AUTHORS.txt
--- a/AUTHORS.txt Thu May 12 14:01:47 2011 -0500
+++ b/AUTHORS.txt Thu Jun 16 10:54:47 2011 -0500
@@ -1,4 +1,4 @@
-The libPC team acknowledges and thanks the following people and companies for
+The PDAL team acknowledges and thanks the following people and companies for
their contributions to this project. The open source community appreciates
their efforts.
diff -r 47f1757b7ba8 -r a06d0eb62042 CMakeLists.txt
--- a/CMakeLists.txt Thu May 12 14:01:47 2011 -0500
+++ b/CMakeLists.txt Thu Jun 16 10:54:47 2011 -0500
@@ -1,10 +1,10 @@
#
-# top-level CMake configuration file for libPC
+# top-level CMake configuration file for PDAL
#
# (based originally on the libLAS files copyright Mateusz Loskot)
cmake_minimum_required(VERSION 2.6.0)
-project(libPC)
+project(PDAL)
#------------------------------------------------------------------------------
# internal cmake settings
@@ -20,28 +20,24 @@
#------------------------------------------------------------------------------
-# libPC general settings
+# PDAL general settings
#------------------------------------------------------------------------------
-# the next three lines are the ONLY place in the entire libpc system where
+# the next three lines are the ONLY place in the entire pdal system where
# the version info is hard-coded
-SET(LIBPC_VERSION_MAJOR "0")
-SET(LIBPC_VERSION_MINOR "1")
-SET(LIBPC_VERSION_PATCH "0")
+SET(PDAL_VERSION_MAJOR "0")
+SET(PDAL_VERSION_MINOR "1")
+SET(PDAL_VERSION_PATCH "0")
-set(LIBPC_VERSION_STRING "${LIBPC_VERSION_MAJOR}.${LIBPC_VERSION_MINOR}.${LIBPC_VERSION_PATCH}")
-SET(LIBPC_LIB_SOVERSION ${LIBPC_VERSION_MAJOR})
-SET(LIBPC_C_LIB_SOVERSION ${LIBPC_VERSION_MAJOR})
+set(PDAL_VERSION_STRING "${PDAL_VERSION_MAJOR}.${PDAL_VERSION_MINOR}.${PDAL_VERSION_PATCH}")
+SET(PDAL_LIB_SOVERSION ${PDAL_VERSION_MAJOR})
+SET(PDAL_C_LIB_SOVERSION ${PDAL_VERSION_MAJOR})
# Name of C++ library
-if(WIN32)
- set(LIBPC_LIB_NAME libpc)
-else()
- set(LIBPC_LIB_NAME pc)
-endif()
+set(PDAL_LIB_NAME pdal)
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@@ -52,16 +48,16 @@
#------------------------------------------------------------------------------
# Choose package components
-set(WITH_APPS TRUE CACHE BOOL "Choose if libPC utilities should be built")
-set(WITH_TESTS TRUE CACHE BOOL "Choose if libPC unit tests should be built")
+set(WITH_APPS TRUE CACHE BOOL "Choose if PDAL utilities should be built")
+set(WITH_TESTS TRUE CACHE BOOL "Choose if PDAL unit tests should be built")
# Choose to use pkg-config or not
set(WITH_PKGCONFIG FALSE CACHE BOOL
- "Choose whether a pkgconfig file (libPC.pc) should be installed")
+ "Choose whether a pkgconfig file (PDAL.pc) should be installed")
-set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libPC should do runtime endianness switching. Note that this can slow things down considerably if enabled by default")
+set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not PDAL should do runtime endianness switching. Note that this can slow things down considerably if enabled by default")
if (WITH_ENDIANAWARE)
- set(LIBPC_ENDIAN_AWARE 1)
+ set(PDAL_ENDIAN_AWARE 1)
endif()
@@ -70,10 +66,10 @@
#------------------------------------------------------------------------------
# Name of test suite runner
-set(LIBPC_UNIT_TEST libpc_test)
+set(PDAL_UNIT_TEST pdal_test)
-# Enable CTest and submissions to libPC dashboard at CDash
-# http://my.cdash.org/index.php?project=libPC
+# Enable CTest and submissions to PDAL dashboard at CDash
+# http://my.cdash.org/index.php?project=PDAL
set(ENABLE_CTEST FALSE CACHE BOOL
"Enable CTest to support submissions of results to CDash at http://cdash.org")
@@ -89,22 +85,22 @@
set(CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
endif()
- message(STATUS "Setting libPC build type - ${CMAKE_BUILD_TYPE}")
+ message(STATUS "Setting PDAL build type - ${CMAKE_BUILD_TYPE}")
endif()
-set(LIBPC_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+set(PDAL_BUILD_TYPE ${CMAKE_BUILD_TYPE})
# TODO: Still testing the output paths --mloskot
-set(LIBPC_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+set(PDAL_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
# Output directory in which to build RUNTIME target files.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBPC_BUILD_OUTPUT_DIRECTORY})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PDAL_BUILD_OUTPUT_DIRECTORY})
# Output directory in which to build LIBRARY target files
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBPC_BUILD_OUTPUT_DIRECTORY})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PDAL_BUILD_OUTPUT_DIRECTORY})
# Output directory in which to build ARCHIVE target files.
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBPC_BUILD_OUTPUT_DIRECTORY})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PDAL_BUILD_OUTPUT_DIRECTORY})
#------------------------------------------------------------------------------
@@ -119,13 +115,13 @@
add_definitions(-D_CRT_NONSTDC_NO_WARNING)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
- set(LIBPC_COMPILER_MSVC 1)
+ set(PDAL_COMPILER_MSVC 1)
if (MSVC10)
- set(LIBPC_COMPILER_VC10 1)
+ set(PDAL_COMPILER_VC10 1)
elseif (MSVC9)
- set(LIBPC_COMPILER_VC9 1)
+ set(PDAL_COMPILER_VC9 1)
elseif (MSVC8)
- set(LIBPC_COMPILER_VC8 1)
+ set(PDAL_COMPILER_VC8 1)
endif()
endif()
@@ -140,28 +136,28 @@
set(CMAKE_INCLUDE_PATH c:/osgeo4w/include;$ENV{CMAKE_INCLUDE_PATH})
set(CMAKE_LIBRARY_PATH c:/osgeo4w/lib;$ENV{CMAKE_LIBRARY_PATH})
- set(LIBPC_OS_WIN32 1)
+ set(PDAL_OS_WIN32 1)
else()
# not WIN32
# Recommended C++ compilation flags
# -Weffc++
- set(LIBPC_COMMON_CXX_FLAGS
+ set(PDAL_COMMON_CXX_FLAGS
"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBPC_COMMON_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PDAL_COMMON_CXX_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
endif()
- set(LIBPC_COMPILER_GCC 1)
+ set(PDAL_COMPILER_GCC 1)
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBPC_COMMON_CXX_FLAGS}")
- set(LIBPC_COMPILER_CLANG 1)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PDAL_COMMON_CXX_FLAGS}")
+ set(PDAL_COMPILER_CLANG 1)
endif()
endif(WIN32)
@@ -214,7 +210,7 @@
if(WITH_GDAL)
find_package(GDAL 1.6.0)
- set(LIBPC_HAVE_GDAL 1)
+ set(PDAL_HAVE_GDAL 1)
include_directories(${GDAL_INCLUDE_DIR})
mark_as_advanced(CLEAR GDAL_INCLUDE_DIR)
mark_as_advanced(CLEAR GDAL_LIBRARY)
@@ -229,7 +225,7 @@
include(CheckFunctionExists)
set(CMAKE_REQUIRED_LIBRARIES ${GEOTIFF_LIBRARY})
include_directories(${GEOTIFF_INCLUDE_DIR})
- set(LIBPC_HAVE_LIBGEOTIFF 1)
+ set(PDAL_HAVE_LIBGEOTIFF 1)
endif()
# Determine libTIFF availability, required
@@ -274,12 +270,12 @@
message(STATUS "Found Swig version ${SWIG_VERSION}")
if(WITH_SWIG_CSHARP)
add_subdirectory(csharp)
- set(LIBPC_HAVE_SWIG_CSHARP 1)
+ set(PDAL_HAVE_SWIG_CSHARP 1)
message(STATUS "Enabling swig for csharp")
endif()
if(WITH_SWIG_PYTHON)
add_subdirectory(python)
- set(LIBPC_HAVE_SWIG_PYTHON 1)
+ set(PDAL_HAVE_SWIG_PYTHON 1)
message(STATUS "Enabling swig for python")
endif()
endif()
@@ -293,7 +289,7 @@
mark_as_advanced(CLEAR LIBXML2_LIBRARIES)
if(LIBXML2_FOUND)
include_directories(${LIBXML2_INCLUDE_DIR})
- set(LIBPC_HAVE_LIBXML2 1)
+ set(PDAL_HAVE_LIBXML2 1)
endif()
endif()
@@ -305,8 +301,7 @@
if(ORACLE_FOUND)
include_directories(${ORACLE_INCLUDE_DIR})
- add_definitions(-DHAVE_ORACLE=1)
- set(LIBPC_HAVE_ORACLE 1)
+ set(PDAL_HAVE_ORACLE 1)
endif()
endif()
@@ -323,7 +318,7 @@
mark_as_advanced(CLEAR LASZIP_INCLUDE_DIR)
mark_as_advanced(CLEAR LASZIP_LIBRARY)
mark_as_advanced(CLEAR LASZIP_VERSION)
- set(LIBPC_HAVE_LASZIP 1)
+ set(PDAL_HAVE_LASZIP 1)
endif()
endif()
@@ -340,13 +335,13 @@
mark_as_advanced(CLEAR LIBLAS_INCLUDE_DIR)
mark_as_advanced(CLEAR LIBLAS_LIBRARY)
mark_as_advanced(CLEAR LIBLAS_VERSION)
- set(LIBPC_HAVE_LIBLAS 1)
+ set(PDAL_HAVE_LIBLAS 1)
endif()
endif()
if (NOT LIBLAS_FOUND)
message(FATAL_ERROR
- "libPC currently requires a working libLAS installation 1.6.0 or greater")
+ "PDAL currently requires a working libLAS installation 1.6.0 or greater")
endif()
# MrSID/LiDAR support - optiona, default=OFF
@@ -358,7 +353,7 @@
set(CMAKE_REQUIRED_LIBRARIES ${MRSID_LIBRARY})
include_directories(${MRSID_INCLUDE_DIR})
add_definitions(-DHAVE_MRSID=1)
- set(LIBPC_HAVE_MRSID 1)
+ set(PDAL_HAVE_MRSID 1)
endif()
endif()
@@ -367,7 +362,7 @@
if(FREEGLUT_FOUND)
include_directories(${FREEGLUT_INCLUDE_DIR})
add_definitions(-DHAVE_FREEGLUT=1)
- set(LIBPC_HAVE_FREEGLUT 1)
+ set(PDAL_HAVE_FREEGLUT 1)
message(STATUS "Found FreeGLUT")
endif()
endif()
@@ -390,30 +385,30 @@
# Common locatoins for Unix and Mac OS X
set(DEFAULT_BIN_SUBDIR bin)
set(DEFAULT_LIB_SUBDIR lib)
- set(DEFAULT_DATA_SUBDIR share/libpc)
+ set(DEFAULT_DATA_SUBDIR share/pdal)
set(DEFAULT_INCLUDE_SUBDIR include)
endif()
-# Locations are changeable by user to customize layout of libPC installation
+# Locations are changeable by user to customize layout of PDAL installation
# (default values are platform-specific)
-set(LIBPC_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
+set(PDAL_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
"Subdirectory where executables will be installed")
-set(LIBPC_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
+set(PDAL_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
"Subdirectory where libraries will be installed")
-set(LIBPC_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
+set(PDAL_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
"Subdirectory where header files will be installed")
-set(LIBPC_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING
+set(PDAL_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING
"Subdirectory where data will be installed")
More information about the Liblas-commits
mailing list