[Liblas-commits] laszip: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Dec 13 23:12:22 EST 2010
changeset bd3dd914ed48 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=bd3dd914ed48
summary: move win32 DEPRECATE stuff into CMake
changeset aa2026d10a92 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=aa2026d10a92
summary: sync w/ Martin's changes
diffstat:
CMakeLists.txt | 204 +++++----
src/CMakeLists.txt | 172 +++----
tools/lasdiff.cpp | 1096 +++++++++++++++++++++++++--------------------------
tools/laszip.cpp | 866 ++++++++++++++++++++--------------------
4 files changed, 1159 insertions(+), 1179 deletions(-)
diffs (truncated from 2358 to 300 lines):
diff -r be0f660c109b -r aa2026d10a92 CMakeLists.txt
--- a/CMakeLists.txt Mon Dec 13 18:19:41 2010 -0800
+++ b/CMakeLists.txt Mon Dec 13 20:09:36 2010 -0800
@@ -1,96 +1,110 @@
-###############################################################################
-# Main CMake configuration file for laszip
-#
-# Author: Mateusz Loskot <mateusz at loskot.net>
-#
-#
-###############################################################################
-# laszip general settings
-project(laszip)
-
-# Name of C++ library
-set(LASZIP_LIB_NAME liblaszip)
-
-
-set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
-
-###############################################################################
-# CMake settings
-cmake_minimum_required(VERSION 2.6.0)
-
-set(CMAKE_COLOR_MAKEFILE ON)
-
-# Allow advanced users to generate Makefiles printing detailed commands
-mark_as_advanced(CLEAR CMAKE_VERBOSE_MAKEFILE )
-
-# Path to additional CMake modules
-set(CMAKE_MODULE_PATH ${laszip_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-
-###############################################################################
-# General build settings
-
-# Default to release mode
-if(NOT MSVC_IDE)
- set(CMAKE_BUILD_TYPE Release CACHE STRING
- "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel")
-endif()
-
-# TODO: Still testing the output paths --mloskot
-set(LASZIP_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE})
-
-# Output directory in which to build RUNTIME target files.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
-
-# Output directory in which to build LIBRARY target files
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
-
-# Output directory in which to build ARCHIVE target files.
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
-
-###############################################################################
-# Installation settings
-
-if(WIN32)
- set(DEFAULT_LIB_SUBDIR lib)
- set(DEFAULT_DATA_SUBDIR .)
- set(DEFAULT_INCLUDE_SUBDIR include)
-
- if (MSVC)
- set(DEFAULT_BIN_SUBDIR bin)
- else()
- set(DEFAULT_BIN_SUBDIR .)
- endif()
-else()
- # Common locations for Unix and Mac OS X
- set(DEFAULT_BIN_SUBDIR bin)
- set(DEFAULT_LIB_SUBDIR lib)
- set(DEFAULT_INCLUDE_SUBDIR include)
-endif()
-
-# Locations are changeable by user to customize layout of laszip installation
-# (default values are platform-specific)
-set(LASZIP_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
- "Subdirectory where executables will be installed")
-set(LASZIP_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
- "Subdirectory where libraries will be installed")
-set(LASZIP_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
- "Subdirectory where header files will be installed")
-set(LASZIP_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING
- "Subdirectory where data will be installed")
-
-# Mark *_SUBDIR variables as advanced and dedicated to use by power-users only.
-mark_as_advanced(LASZIP_BIN_SUBDIR
- LASZIP_LIB_SUBDIR LASZIP_INCLUDE_SUBDIR LASZIP_DATA_SUBDIR)
-
-# Full paths for the installation
-set(LASZIP_BIN_DIR ${LASZIP_BIN_SUBDIR})
-set(LASZIP_LIB_DIR ${LASZIP_LIB_SUBDIR})
-set(LASZIP_INCLUDE_DIR ${LASZIP_INCLUDE_SUBDIR})
-set(LASZIP_DATA_DIR ${LASZIP_DATA_SUBDIR})
-
-###############################################################################
-# Processing of project directories
-
-add_subdirectory(src)
-
+###############################################################################
+# Main CMake configuration file for laszip
+#
+# Author: Mateusz Loskot <mateusz at loskot.net>
+#
+#
+###############################################################################
+# laszip general settings
+project(laszip)
+
+# Name of C++ library
+set(LASZIP_LIB_NAME liblaszip)
+
+
+set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+
+###############################################################################
+# CMake settings
+cmake_minimum_required(VERSION 2.6.0)
+
+set(CMAKE_COLOR_MAKEFILE ON)
+
+# Allow advanced users to generate Makefiles printing detailed commands
+mark_as_advanced(CLEAR CMAKE_VERBOSE_MAKEFILE )
+
+# Path to additional CMake modules
+set(CMAKE_MODULE_PATH ${laszip_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+
+###############################################################################
+# General build settings
+
+# Default to release mode
+if(NOT MSVC_IDE)
+ set(CMAKE_BUILD_TYPE Release CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel")
+endif()
+
+# TODO: Still testing the output paths --mloskot
+set(LASZIP_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE})
+
+# Output directory in which to build RUNTIME target files.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+# Output directory in which to build LIBRARY target files
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+# Output directory in which to build ARCHIVE target files.
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+###############################################################################
+# Platform and compiler specific settings
+
+if(WIN32)
+ if (MSVC)
+ if (MSVC80 OR MSVC90 OR MSVC10)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ add_definitions(-D_CRT_NONSTDC_NO_WARNING)
+ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+ endif()
+ endif()
+endif()
+
+###############################################################################
+# Installation settings
+
+if(WIN32)
+ set(DEFAULT_LIB_SUBDIR lib)
+ set(DEFAULT_DATA_SUBDIR .)
+ set(DEFAULT_INCLUDE_SUBDIR include)
+
+ if (MSVC)
+ set(DEFAULT_BIN_SUBDIR bin)
+ else()
+ set(DEFAULT_BIN_SUBDIR .)
+ endif()
+else()
+ # Common locations for Unix and Mac OS X
+ set(DEFAULT_BIN_SUBDIR bin)
+ set(DEFAULT_LIB_SUBDIR lib)
+ set(DEFAULT_INCLUDE_SUBDIR include)
+endif()
+
+# Locations are changeable by user to customize layout of laszip installation
+# (default values are platform-specific)
+set(LASZIP_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
+ "Subdirectory where executables will be installed")
+set(LASZIP_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
+ "Subdirectory where libraries will be installed")
+set(LASZIP_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
+ "Subdirectory where header files will be installed")
+set(LASZIP_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING
+ "Subdirectory where data will be installed")
+
+# Mark *_SUBDIR variables as advanced and dedicated to use by power-users only.
+mark_as_advanced(LASZIP_BIN_SUBDIR
+ LASZIP_LIB_SUBDIR LASZIP_INCLUDE_SUBDIR LASZIP_DATA_SUBDIR)
+
+# Full paths for the installation
+set(LASZIP_BIN_DIR ${LASZIP_BIN_SUBDIR})
+set(LASZIP_LIB_DIR ${LASZIP_LIB_SUBDIR})
+set(LASZIP_INCLUDE_DIR ${LASZIP_INCLUDE_SUBDIR})
+set(LASZIP_DATA_DIR ${LASZIP_DATA_SUBDIR})
+
+###############################################################################
+# Processing of project directories
+
+add_subdirectory(src)
+
add_subdirectory(tools)
\ No newline at end of file
diff -r be0f660c109b -r aa2026d10a92 src/CMakeLists.txt
--- a/src/CMakeLists.txt Mon Dec 13 18:19:41 2010 -0800
+++ b/src/CMakeLists.txt Mon Dec 13 20:09:36 2010 -0800
@@ -1,100 +1,74 @@
-###############################################################################
-#
-# src/CMakeLists.txt controls building of laszip library
-#
-# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
-#
-###############################################################################
-
-set(LASZIP_HEADERS_DIR ../include/laszip)
-
-set(LASZIP_HPP
- ${LASZIP_HEADERS_DIR}/lasdefinitions.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter.hpp
- ${LASZIP_HEADERS_DIR}/lasdefinitions.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter0compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter0compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader0compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter0raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader0compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter1compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader0raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter1compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader1compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter1raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader1compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter2compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader1raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter2compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader2compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter2raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader2compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter3compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader2raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter3compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader3compressed.hpp
- ${LASZIP_HEADERS_DIR}/laspointwriter3raw.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader3compressedarithmetic.hpp
- ${LASZIP_HEADERS_DIR}/lasreader.hpp
- ${LASZIP_HEADERS_DIR}/laspointreader3raw.hpp
- ${LASZIP_HEADERS_DIR}/laswriter.hpp
- ${LASZIP_HEADERS_DIR}/liblaszip.hpp
-)
-
-set(LASZIP_CPP
- arithmeticdecoder.cpp
- laspointwriter0compressedarithmetic.cpp
- arithmeticencoder.cpp
- laspointwriter1compressed.cpp
- arithmeticintegercompressor.cpp
- laspointwriter1compressedarithmetic.cpp
- arithmeticmodel.cpp
- laspointwriter2compressed.cpp
- laspointreader0compressed.cpp
- laspointwriter2compressedarithmetic.cpp
- laspointreader0compressedarithmetic.cpp
- laspointwriter3compressed.cpp
- laspointreader1compressed.cpp
- laspointwriter3compressedarithmetic.cpp
- laspointreader1compressedarithmetic.cpp
- lasreader.cpp
- laspointreader2compressed.cpp
- laswriter.cpp
- laspointreader2compressedarithmetic.cpp
- rangedecoder.cpp
- laspointreader3compressed.cpp
- rangeencoder.cpp
- laspointreader3compressedarithmetic.cpp
- rangeintegercompressor.cpp
- laspointwriter0compressed.cpp
- rangemodel.cpp
- liblaszip.cpp
-)
-
-set(LASZIP_SOURCES
- ${LASZIP_HPP}
- ${LASZIP_CPP}
- )
-# Group source files for IDE source explorers (e.g. Visual Studio)
-source_group("CMake Files" FILES CMakeLists.txt)
-source_group("Header Files" FILES ${LASZIP_HPP})
-source_group("Source Files" FILES ${LASZIP_CPP})
-
-# Standard include directory of laszip library
-include_directories(../include ../include/laszip .)
More information about the Liblas-commits
mailing list