[Liblas-commits] libpc: cmake builds now working
liblas-commits at liblas.org
liblas-commits at liblas.org
Thu Feb 10 23:46:57 EST 2011
details: http://hg.liblas.orglibpc/rev/9eb63a800374
changeset: 28:9eb63a800374
user: Michael P. Gerlek <mpg at flaxen.com>
date: Wed Feb 09 20:38:20 2011 -0800
description:
cmake builds now working
diffstat:
apps/pcinfo.cpp | 6 +++-
include/libpc/Bounds.hpp | 3 +-
include/libpc/export.hpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
src/CMakeLists.txt | 1 +
4 files changed, 67 insertions(+), 3 deletions(-)
diffs (107 lines):
diff -r c60e5261cfc2 -r 9eb63a800374 apps/pcinfo.cpp
--- a/apps/pcinfo.cpp Wed Feb 09 20:14:32 2011 -0800
+++ b/apps/pcinfo.cpp Wed Feb 09 20:38:20 2011 -0800
@@ -9,10 +9,12 @@
* See LICENSE.txt in this source distribution for more information.
**************************************************************************/
-#include <stdio.h>
+#include <libpc/Bounds.hpp>
+
int main(int, char* [])
{
- printf("Hi\n");
+ Bounds bounds(0,1,2,3,4,5);
+ bounds.dump();
return 0;
}
#if 0
diff -r c60e5261cfc2 -r 9eb63a800374 include/libpc/Bounds.hpp
--- a/include/libpc/Bounds.hpp Wed Feb 09 20:14:32 2011 -0800
+++ b/include/libpc/Bounds.hpp Wed Feb 09 20:38:20 2011 -0800
@@ -36,8 +36,9 @@
#define INCLUDED_BOUNDS_HPP
#include <limits>
+#include "export.hpp"
-class Bounds
+class PC_DLL Bounds
{
public:
Bounds()
diff -r c60e5261cfc2 -r 9eb63a800374 include/libpc/export.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/libpc/export.hpp Wed Feb 09 20:38:20 2011 -0800
@@ -0,0 +1,60 @@
+/******************************************************************************
+* Copyright (c) 2010, Howard Butler
+*
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following
+* conditions are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in
+* the documentation and/or other materials provided
+* with the distribution.
+* * Neither the name of Hobu, Inc. or Flaxen Geo Consulting nor the
+* names of its contributors may be used to endorse or promote
+* products derived from this software without specific prior
+* written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+* OF SUCH DAMAGE.
+****************************************************************************/
+
+#ifndef PCEXPORT_HPP_INCLUDED
+#define PCEXPORT_HPP_INCLUDED
+
+#ifndef PC_DLL
+#if defined(_MSC_VER) && !defined(PC_DISABLE_DLL)
+#if defined(PC_DLL_EXPORT)
+# define PC_DLL __declspec(dllexport)
+#elif defined(PC_DLL_IMPORT)
+# define PC_DLL __declspec(dllimport)
+#else
+# define PC_DLL
+#endif
+#else
+# if defined(USE_GCC_VISIBILITY_FLAG)
+# define PC_DLL __attribute__ ((visibility("default")))
+# else
+# define PC_DLL
+# endif
+#endif
+#endif
+
+#ifdef _MSC_VER
+//#pragma warning(disable:4251 4275)
+#endif // _MSC_VER
+
+#endif // LIBPC_HPP_INCLUDED
diff -r c60e5261cfc2 -r 9eb63a800374 src/CMakeLists.txt
--- a/src/CMakeLists.txt Wed Feb 09 20:14:32 2011 -0800
+++ b/src/CMakeLists.txt Wed Feb 09 20:38:20 2011 -0800
@@ -20,6 +20,7 @@
set(LIBPC_HEADERS_DIR ../include/libpc)
set(LIBPC_HPP
+ ${LIBPC_HEADERS_DIR}/export.hpp
${LIBPC_HEADERS_DIR}/Bounds.hpp
${LIBPC_HEADERS_DIR}/ColorFilter.hpp
${LIBPC_HEADERS_DIR}/CropFilter.hpp
More information about the Liblas-commits
mailing list