[Liblas-commits] hg-main-tree: oops, rollback that
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Mar 16 10:21:43 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/a05d0988a183
changeset: 265:a05d0988a183
user: Howard Butler <hobu.inc at gmail.com>
date: Wed Mar 16 09:16:58 2011 -0500
description:
oops, rollback that
Subject: hg-main-tree: more epsilon compares
details: http://hg.libpc.orghg-main-tree/rev/f1f8a450b831
changeset: 266:f1f8a450b831
user: Howard Butler <hobu.inc at gmail.com>
date: Wed Mar 16 09:21:28 2011 -0500
description:
more epsilon compares
Subject: hg-main-tree: merge
details: http://hg.libpc.orghg-main-tree/rev/9fd5882cf6dd
changeset: 267:9fd5882cf6dd
user: Howard Butler <hobu.inc at gmail.com>
date: Wed Mar 16 09:21:33 2011 -0500
description:
merge
diffstat:
src/CMakeLists.txt | 241 +++++++++++++++++++++++++++++--------
src/drivers/faux/CMakeLists.txt | 19 --
src/drivers/las/CMakeLists.txt | 24 ---
src/drivers/liblas/CMakeLists.txt | 16 --
src/drivers/oci/CMakeLists.txt | 23 ---
src/drivers/oci/Writer.cpp | 2 +-
src/filters/CMakeLists.txt | 23 ---
test/unit/ChipperTest.cpp | 10 +-
test/unit/FauxReaderTest.cpp | 8 +-
9 files changed, 193 insertions(+), 173 deletions(-)
diffs (truncated from 464 to 300 lines):
diff -r da306659b94a -r 9fd5882cf6dd src/CMakeLists.txt
--- a/src/CMakeLists.txt Wed Mar 16 09:02:17 2011 -0500
+++ b/src/CMakeLists.txt Wed Mar 16 09:21:33 2011 -0500
@@ -14,12 +14,24 @@
tifvsi.cpp)
endif()
+
###############################################################################
# Source files specification
+#
+# Naming format:
+# LIBPC_CPP - all the .cpp files
+# LIBPC_HPP - all the .hpp files
+# LIBPC_<dirname>_CPP - all the .cpp files for the given subdir/namespace
+# ...
set(LIBPC_HEADERS_DIR ../include/libpc)
+set(LIBPC_HPP "")
+set(LIBPC_CPP "")
-set(LIBPC_HPP
+#
+# base
+#
+set(LIBPC_BASE_HPP
${LIBPC_HEADERS_DIR}/exceptions.hpp
${LIBPC_HEADERS_DIR}/export.hpp
${LIBPC_HEADERS_DIR}/libpc_config.hpp
@@ -42,60 +54,9 @@
${LIBPC_HEADERS_DIR}/Stage.hpp
${LIBPC_HEADERS_DIR}/Utils.hpp
${LIBPC_HEADERS_DIR}/Writer.hpp
- )
+)
-set(LIBPC_DRIVERS_FAUX_HPP
- ${LIBPC_HEADERS_DIR}/drivers/faux/Writer.hpp
- ${LIBPC_HEADERS_DIR}/drivers/faux/Reader.hpp
-)
-FOREACH(file ${LIBPC_DRIVERS_FAUX_HPP})
- SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
-ENDFOREACH(file)
-
-set(LIBPC_DRIVERS_LAS_HPP
- ${LIBPC_HEADERS_DIR}/drivers/las/Header.hpp
- ${LIBPC_HEADERS_DIR}/drivers/las/Writer.hpp
- ${LIBPC_HEADERS_DIR}/drivers/las/Reader.hpp
-)
-FOREACH(file ${LIBPC_DRIVERS_LAS_HPP})
- SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
-ENDFOREACH(file)
-
-set(LIBPC_DRIVERS_LIBLAS_HPP
- ${LIBPC_HEADERS_DIR}/drivers/liblas/Writer.hpp
- ${LIBPC_HEADERS_DIR}/drivers/liblas/Reader.hpp
-)
-FOREACH(file ${LIBPC_DRIVERS_LIBLAS_HPP})
- SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
-ENDFOREACH(file)
-
-set(LIBPC_DRIVERS_OCI_HPP
- ${LIBPC_HEADERS_DIR}/drivers/oci/Writer.hpp
- ${LIBPC_HEADERS_DIR}/drivers/oci/Reader.hpp
-)
-FOREACH(file ${LIBPC_DRIVERS_OCI_HPP})
- SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
-ENDFOREACH(file)
-
-set(LIBPC_FILTERS_HPP
- ${LIBPC_HEADERS_DIR}/filters/CacheFilter.hpp
- ${LIBPC_HEADERS_DIR}/filters/ColorFilter.hpp
- ${LIBPC_HEADERS_DIR}/filters/CropFilter.hpp
- ${LIBPC_HEADERS_DIR}/filters/DecimationFilter.hpp
- ${LIBPC_HEADERS_DIR}/filters/MosaicFilter.hpp
-)
-FOREACH(file ${LIBPC_FILTERS_HPP})
- SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
-ENDFOREACH(file)
-
-set (LIBPC_SOURCES "libpc_config.cpp" CACHE INTERNAL "sources to compile")
-set (APPS_CPP_DEPENDENCIES "${LIBPC_LIB_NAME}" CACHE INTERNAL "libraries to link")
-
-add_subdirectory(drivers)
-add_subdirectory(filters)
-
-set(LIBPC_CPP
- ${LIBPC_SOURCES}
+set(LIBPC_BASE_CPP
Bounds.cpp
Chipper.cpp
Color.cpp
@@ -114,13 +75,177 @@
SpatialReference.cpp
Stage.cpp
Utils.cpp
- Writer.cpp)
+ Writer.cpp
+)
+FOREACH(file ${LIBPC_BASE_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+FOREACH(file ${LIBPC_BASE_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
+# drivers/faux
+#
+set(LIBPC_DRIVERS_FAUX_HPP
+ ${LIBPC_HEADERS_DIR}/drivers/faux/Writer.hpp
+ ${LIBPC_HEADERS_DIR}/drivers/faux/Reader.hpp
+)
+
+set (LIBPC_DRIVERS_FAUX_CPP
+ ./drivers/faux/Reader.cpp
+ ./drivers/faux/Writer.cpp
+)
+
+FOREACH(file ${LIBPC_DRIVERS_FAUX_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+FOREACH(file ${LIBPC_DRIVERS_FAUX_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
+# drivers/las
+#
+
+set (LIBPC_DRIVERS_LAS_HPP
+ ${LIBPC_HEADERS_DIR}/drivers/las/Header.hpp
+ ${LIBPC_HEADERS_DIR}/drivers/las/Writer.hpp
+ ${LIBPC_HEADERS_DIR}/drivers/las/Reader.hpp
+ ./drivers/las/LasHeaderReader.hpp
+ ./drivers/las/LasHeaderWriter.hpp
+)
+
+set (LIBPC_DRIVERS_LAS_CPP
+ ./drivers/las/LasHeaderReader.cpp
+ ./drivers/las/LasHeaderWriter.cpp
+ ./drivers/las/Header.cpp
+ ./drivers/las/Reader.cpp
+ ./drivers/las/Writer.cpp
+)
+
+FOREACH(file ${LIBPC_DRIVERS_LAS_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+FOREACH(file ${LIBPC_DRIVERS_LAS_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
+# drivers/liblas
+#
+
+set (LIBPC_DRIVERS_LIBLAS_HPP
+ ${LIBPC_HEADERS_DIR}/drivers/liblas/Writer.hpp
+ ${LIBPC_HEADERS_DIR}/drivers/liblas/Reader.hpp
+)
+
+set (LIBPC_DRIVERS_LIBLAS_CPP
+ ./drivers/liblas/header.cpp
+ ./drivers/liblas/Reader.cpp
+ ./drivers/liblas/Writer.cpp
+)
+
+FOREACH(file ${LIBPC_DRIVERS_LIBLAS_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+FOREACH(file ${LIBPC_DRIVERS_LIBLAS_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
+# drivers/oci
+#
+if (WITH_ORACLE)
+set(LIBPC_DRIVERS_OCI_HPP
+ ${LIBPC_HEADERS_DIR}/drivers/oci/Writer.hpp
+ ${LIBPC_HEADERS_DIR}/drivers/oci/Reader.hpp
+)
+
+set (LIBPC_DRIVERS_OCI_CPP
+ ./drivers/oci/oci_wrapper.cpp
+ ./drivers/oci/common.cpp
+ ./drivers/oci/header.cpp
+ ./drivers/oci/Reader.cpp
+ ./drivers/oci/Writer.cpp
+)
+
+FOREACH(file ${LIBPC_DRIVERS_OCI_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+FOREACH(file ${LIBPC_DRIVERS_OCI_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+endif()
+
+#
+# filters
+#
+
+set(LIBPC_FILTERS_HPP
+ ${LIBPC_HEADERS_DIR}/filters/CacheFilter.hpp
+ ${LIBPC_HEADERS_DIR}/filters/ColorFilter.hpp
+ ${LIBPC_HEADERS_DIR}/filters/CropFilter.hpp
+ ${LIBPC_HEADERS_DIR}/filters/DecimationFilter.hpp
+ ${LIBPC_HEADERS_DIR}/filters/MosaicFilter.hpp
+)
+
+set (LIBPC_FILTERS_HPP
+ ./filters/CacheFilter.cpp
+ ./filters/ColorFilter.cpp
+ ./filters/CropFilter.cpp
+ ./filters/DecimationFilter.cpp
+ ./filters/MosaicFilter.cpp
+)
+
+FOREACH(file ${LIBPC_FILTERS_HPP})
+ SET(LIBPC_HPP "${LIBPC_HPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+FOREACH(file ${LIBPC_FILTERS_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
+# misc
+#
+
+set (LIBPC_MISC_CPP "libpc_config.cpp" CACHE INTERNAL "sources to compile")
+FOREACH(file ${LIBPC_MISC_CPP})
+ SET(LIBPC_CPP "${LIBPC_CPP};${file}" CACHE INTERNAL "source files for foo")
+ENDFOREACH(file)
+
+#
# Group source files for IDE source explorers (e.g. Visual Studio)
+#
+
source_group("CMake Files" FILES CMakeLists.txt)
-source_group("Header Files" FILES ${LIBPC_HPP})
-source_group("Source Files" FILES ${LIBPC_CPP})
+
+source_group("Header Files" FILES ${LIBPC_BASE_HPP})
+source_group("Header Files\\drivers\\faux" FILES ${LIBPC_DRIVERS_FAUX_HPP})
+source_group("Header Files\\drivers\\las" FILES ${LIBPC_DRIVERS_LAS_HPP})
+source_group("Header Files\\drivers\\liblas" FILES ${LIBPC_DRIVERS_LIBLAS_HPP})
+source_group("Header Files\\drivers\\oci" FILES ${LIBPC_DRIVERS_OCI_HPP})
+source_group("Header Files\\filters" FILES ${LIBPC_FILTERS_HPP})
+
+source_group("Source Files" FILES ${LIBPC_BASE_CPP})
+source_group("Source Files\\misc" FILES ${LIBPC_MISC_CPP})
+source_group("Source Files\\filter" FILES ${LIBPC_FILTERS_CPP})
+source_group("Source Files\\drivers\\faux" FILES ${LIBPC_DRIVERS_FAUX_CPP})
+source_group("Source Files\\drivers\\las" FILES ${LIBPC_DRIVERS_LAS_CPP})
+source_group("Source Files\\drivers\\liblas" FILES ${LIBPC_DRIVERS_LIBLAS_CPP})
+source_group("Source Files\\drivers\\oci" FILES ${LIBPC_DRIVERS_OCI_CPP})
+
+#
+# rest of stuff
+#
+
if(GDAL_FOUND)
source_group("Source Files\\gdal" FILES ${LIBPC_GDAL_CPP})
endif()
@@ -128,6 +253,8 @@
# Standard include directory of libPC library
include_directories(../include)
+set (APPS_CPP_DEPENDENCIES "${LIBPC_LIB_NAME}" CACHE INTERNAL "libraries to link")
+
###############################################################################
# Targets settings
diff -r da306659b94a -r 9fd5882cf6dd src/drivers/faux/CMakeLists.txt
--- a/src/drivers/faux/CMakeLists.txt Wed Mar 16 09:02:17 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-###############################################################################
-#
-# src/drivers/liblas/CMakeLists.txt controls building of libPC library
-#
-# Copyright (c) 2011 Howard Butler <hobu at hobu.net>
-#
-###############################################################################
-
-set (FAUX_SOURCES
- Reader.cpp
- Writer.cpp
- )
-
-SET(APPS_CPP_DEPENDENCIES "${APPS_CPP_DEPENDENCIES};${ORACLE_LIBRARY}" CACHE INTERNAL "source files for foo")
More information about the Liblas-commits
mailing list