[Liblas-commits] laszip: add a few more ignores
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Jan 3 13:06:42 EST 2011
details: http://hg.liblas.orglaszip/rev/f3729328ee77
changeset: 102:f3729328ee77
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 11:48:54 2011 -0600
description:
add a few more ignores
Subject: laszip: add a laszip-config target
details: http://hg.liblas.orglaszip/rev/d48a54cc320b
changeset: 103:d48a54cc320b
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 11:49:29 2011 -0600
description:
add a laszip-config target
Subject: laszip: add packaging and soname for dll
details: http://hg.liblas.orglaszip/rev/43aa7323c711
changeset: 104:43aa7323c711
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 11:49:44 2011 -0600
description:
add packaging and soname for dll
Subject: laszip: ignore .lax test files and change location of laszip-config and laszip.pc package config files
details: http://hg.liblas.orglaszip/rev/3075e12e3a47
changeset: 105:3075e12e3a47
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 12:05:51 2011 -0600
description:
ignore .lax test files and change location of laszip-config and laszip.pc package config files
Subject: laszip: bring in line with cmake setup
details: http://hg.liblas.orglaszip/rev/0a245357c2cd
changeset: 106:0a245357c2cd
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 12:06:06 2011 -0600
description:
bring in line with cmake setup
Subject: laszip: bring in line with cmake setup
details: http://hg.liblas.orglaszip/rev/03aa58b60bf5
changeset: 107:03aa58b60bf5
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 12:06:15 2011 -0600
description:
bring in line with cmake setup
Subject: laszip: add laszip-config and laszip.pc packageconfig
details: http://hg.liblas.orglaszip/rev/5ea850338ed1
changeset: 108:5ea850338ed1
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 03 12:06:27 2011 -0600
description:
add laszip-config and laszip.pc packageconfig
diffstat:
.hgignore | 10 ++++++-
CMakeLists.txt | 37 ++++++++++++++++++++++++-
configure.ac | 8 ++--
include/laszip/Makefile.am | 2 +-
laszip-config.in | 53 ------------------------------------
src/CMakeLists.txt | 3 ++
tools/CMakeLists.txt | 36 ++++++++++++++++++++++++
tools/laszip-config.in | 67 ++++++++++++++++++++++++++++++++++++++++++++++
tools/laszip.pc.in | 12 ++++++++
9 files changed, 168 insertions(+), 60 deletions(-)
diffs (truncated from 323 to 300 lines):
diff -r 25aa62883097 -r 5ea850338ed1 .hgignore
--- a/.hgignore Mon Jan 03 11:30:22 2011 -0600
+++ b/.hgignore Mon Jan 03 12:06:27 2011 -0600
@@ -1,4 +1,5 @@
syntax: glob
+
.deps
install_manifest.txt
tools/lasdiff
@@ -63,11 +64,14 @@
CMakeFiles
CMakeCache.txt
cmake_install.cmake
+.DS_Store
+CPackConfig.cmake
+_CPack_Packages/
+CPackSourceConfig.cmake
src/liblas.a
Debug
Release
.DS_Store
-laszip-config
tools/laszip
# stuff generated by VS2010
@@ -78,3 +82,7 @@
laszip.sdf
laszip.sln
laszip/laszip.sdf
+
+tools/laszip.pc
+tools/laszip-config
+*.lax
diff -r 25aa62883097 -r 5ea850338ed1 CMakeLists.txt
--- a/CMakeLists.txt Mon Jan 03 11:30:22 2011 -0600
+++ b/CMakeLists.txt Mon Jan 03 12:06:27 2011 -0600
@@ -8,6 +8,13 @@
# laszip general settings
project(laszip)
+
+SET(LASZIP_VERSION_MAJOR "1")
+SET(LASZIP_VERSION_MINOR "0")
+SET(LASZIP_VERSION_PATCH "b1")
+set(VERSION "${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}.${LASZIP_VERSION_PATCH}")
+SET(LASZIP_LIB_SOVERSION "1.0.0")
+
if(WIN32)
# Name of C++ library
set(LASZIP_LIB_NAME liblaszip)
@@ -116,4 +123,32 @@
add_subdirectory(src)
-add_subdirectory(tools)
\ No newline at end of file
+add_subdirectory(tools)
+
+
+# Version information
+SET(CPACK_PACKAGE_VERSION_MAJOR ${LASZIP_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${LASZIP_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${LASZIP_VERSION_MINOR})
+SET(OSGEO4W_UPSTREAM_RELEASE "2")
+
+SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_RESOURCE_FILE_LICENSE "${laszip_SOURCE_DIR}/COPYING")
+
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ "${CMAKE_PROJECT_NAME}-${VERSION}")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".hg")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
+
+include(CPack)
+
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
diff -r 25aa62883097 -r 5ea850338ed1 configure.ac
--- a/configure.ac Mon Jan 03 11:30:22 2011 -0600
+++ b/configure.ac Mon Jan 03 12:06:27 2011 -0600
@@ -2,9 +2,9 @@
dnl
dnl This is main autoconf bootstrap script of libLAS project.
dnl
-m4_define([laszip_version_major], [0])
-m4_define([laszip_version_minor], [1])
-m4_define([laszip_version_micro], [0])
+m4_define([laszip_version_major], [1])
+m4_define([laszip_version_minor], [0])
+m4_define([laszip_version_micro], [b1])
m4_define([laszip_version],
[laszip_version_major.laszip_version_minor.laszip_version_micro])
@@ -119,7 +119,7 @@
include/laszip/Makefile
src/Makefile
tools/Makefile
- laszip-config
+ tools/laszip-config
])
diff -r 25aa62883097 -r 5ea850338ed1 include/laszip/Makefile.am
--- a/include/laszip/Makefile.am Mon Jan 03 11:30:22 2011 -0600
+++ b/include/laszip/Makefile.am Mon Jan 03 12:06:27 2011 -0600
@@ -3,4 +3,4 @@
laszip_HEADERS = lasunzipper.hpp \
laszip.hpp \
laszipper.hpp \
- liblaszip.hpp
+ export.hpp
diff -r 25aa62883097 -r 5ea850338ed1 laszip-config.in
--- a/laszip-config.in Mon Jan 03 11:30:22 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-
-
-usage()
-{
- cat <<EOF
-Usage: laszip-config [OPTIONS]
-Options:
- [--libs]
- [--cflags]
- [--cxxflags]
- [--defines]
- [--includes]
- [--version]
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-case $1 in
- --libs)
- echo @LIBS@
- ;;
-
- --defines)
- echo @DEFS@
- ;;
-
- --includes)
- echo
- ;;
-
- --cflags)
- echo @CFLAGS@
- ;;
-
- --cxxflags)
- echo @CXXFLAGS@
- ;;
-
- --version)
- echo @RELEASE_VERSION@
- ;;
-
- *)
- usage 1 1>&2
- ;;
-
-esac
diff -r 25aa62883097 -r 5ea850338ed1 src/CMakeLists.txt
--- a/src/CMakeLists.txt Mon Jan 03 11:30:22 2011 -0600
+++ b/src/CMakeLists.txt Mon Jan 03 12:06:27 2011 -0600
@@ -70,7 +70,10 @@
# Standard include directory of laszip library
include_directories(../include ../include/laszip .)
+
add_library(${LASZIP_LIB_NAME} SHARED ${LASZIP_SOURCES})
+set_target_properties(${LASZIP_LIB_NAME}
+ PROPERTIES SOVERSION "${LASZIP_LIB_SOVERSION}" )
###############################################################################
# Targets installation
diff -r 25aa62883097 -r 5ea850338ed1 tools/CMakeLists.txt
--- a/tools/CMakeLists.txt Mon Jan 03 11:30:22 2011 -0600
+++ b/tools/CMakeLists.txt Mon Jan 03 12:06:27 2011 -0600
@@ -59,6 +59,42 @@
target_link_libraries(${LASZIPPERTEST} ${APPS_CPP_DEPENDENCIES} )
endif()
+
+if(UNIX)
+ # Autoconf compatibility variables to use the same script source.
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+
+ GET_DIRECTORY_PROPERTY(LASZIP_DEFINITIONS DIRECTORY ${laszip_SOURCE_DIR}/ COMPILE_DEFINITIONS)
+
+ set(LASZIP_CONFIG_DEFINITIONS "")
+ foreach(definition ${LASZIP_DEFINITIONS})
+ set(LASZIP_CONFIG_DEFINITIONS "${LASZIP_CONFIG_DEFINITIONS} -D${definition}")
+ endforeach()
+
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/laszip-config.in
+ ${CMAKE_CURRENT_BINARY_DIR}/laszip-config @ONLY)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laszip-config
+ DESTINATION bin/
+ PERMISSIONS
+ OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+ #pkgconfig
+ set(PKGCFG_PREFIX "${CMAKE_INSTALL_PREFIX}")
+ set(PKGCFG_INC_DIR "${CMAKE_INSTALL_PREFIX}/${LIBLAS_INCLUDE_SUBDIR}")
+ set(PKGCFG_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${LIBLAS_LIB_SUBDIR}")
+ set(PKGCFG_REQUIRES "")
+ set(PKGCFG_VERSION ${VERSION})
+ set(PKGCFG_LINK_FLAGS "-llaszip")
+ set(PKGCFG_COMPILE_FLAGS "$CMAKE_CXX_FLAGS")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/laszip.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/laszip.pc @ONLY)
+
+
+endif(UNIX)
###############################################################################
# Targets installation
diff -r 25aa62883097 -r 5ea850338ed1 tools/laszip-config.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/laszip-config.in Mon Jan 03 12:06:27 2011 -0600
@@ -0,0 +1,67 @@
+#!/bin/sh
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+INCLUDES="-I${prefix}/include "
+LIBS="-L$libdir -llaszip"
+
+
+
+usage()
+{
+ cat <<EOF
+Usage: laszip-config [OPTIONS]
+Options:
+ [--libs]
+ [--cflags]
+ [--cxxflags]
+ [--defines]
+ [--includes]
+ [--version]
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+case $1 in
+ --libs)
+ echo $LIBS
+ ;;
+
+ --prefix)
+ echo ${prefix}
+ ;;
+
+ --ldflags)
+ echo -L${libdir}
+ ;;
+
+ --defines)
+ echo @LASZIP_CONFIG_DEFINITIONS@ @DEFS@
+ ;;
+
+ --includes)
+ echo ${INCLUDES}
+ ;;
+
+ --cflags)
+ echo @CMAKE_C_FLAGS@ @CFLAGS@
+ ;;
+
+ --cxxflags)
+ echo @CMAKE_CXX_FLAGS@ @CXXFLAGS@
+ ;;
+
+ --version)
+ echo @VERSION@
More information about the Liblas-commits
mailing list