This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libcitygml.
commit 97ff362f772d6d7f70ce6e0f05584e1a6ea63fc5
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Jul 24 18:37:53 2015 +0200
Split rewrite_cmake.diff into separate patches.
---
debian/changelog | 1 +
debian/patches/install-citygmltest.diff | 12 ++
debian/patches/install-paths.diff | 54 ++++++
debian/patches/pkgconfig-support.diff | 13 +-
debian/patches/rewrite_cmake.diff | 312 --------------------------------
debian/patches/series | 4 +-
debian/patches/soversion.diff | 17 ++
7 files changed, 98 insertions(+), 315 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 97fc575..ed132b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium
* Update copyright file, use Comment instead of extended Copyright.
* Refresh information-typo.diff patch.
* Override dh_install to use --list-missing.
+ * Split rewrite_cmake.diff into separate patches.
-- Bas Couwenberg <sebas...@debian.org> Fri, 24 Jul 2015 16:31:57 +0200
diff --git a/debian/patches/install-citygmltest.diff
b/debian/patches/install-citygmltest.diff
new file mode 100644
index 0000000..553720a
--- /dev/null
+++ b/debian/patches/install-citygmltest.diff
@@ -0,0 +1,12 @@
+Description: Install citygmltest utility.
+Author: YunQiang Su <wzss...@gmail.com>
+
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -41,3 +41,6 @@ ADD_EXECUTABLE( citygmltest ${PRG_SRCS}
+ # ENDIF( MSVC_IDE )
+
+ TARGET_LINK_LIBRARIES( citygmltest citygml ${XERCESC_LIBRARY}
${OPENGL_LIBRARIES} )
++
++install(TARGETS citygmltest RUNTIME DESTINATION ${BIN_INSTALL_DIR})
++
diff --git a/debian/patches/install-paths.diff
b/debian/patches/install-paths.diff
new file mode 100644
index 0000000..3e578f2
--- /dev/null
+++ b/debian/patches/install-paths.diff
@@ -0,0 +1,54 @@
+Description: Add user customizable install paths.
+Author: YunQiang Su <wzss...@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,6 +97,28 @@ SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/
+ MAKE_DIRECTORY(${OUTPUT_LIBDIR})
+ SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
+
++if(NOT DEFINED BIN_INSTALL_DIR)
++ set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++endif(NOT DEFINED BIN_INSTALL_DIR)
++if(NOT DEFINED LIB_INSTALL_DIR)
++ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++endif(NOT DEFINED LIB_INSTALL_DIR)
++if(NOT DEFINED DATA_INSTALL_DIR)
++ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share")
++endif(NOT DEFINED DATA_INSTALL_DIR)
++if(NOT DEFINED INCLUDE_INSTALL_DIR)
++ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/citygml")
++endif(NOT DEFINED INCLUDE_INSTALL_DIR)
++if(NOT DEFINED MAN_INSTALL_DIR)
++ set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man")
++endif(NOT DEFINED MAN_INSTALL_DIR)
++if(NOT DEFINED RESOURCE_INSTALL_DIR)
++ set(RESOURCE_INSTALL_DIR
"${DATA_INSTALL_DIR}/libcitygml${META_VERSION_MAJOR}/resource/")
++endif(NOT DEFINED RESOURCE_INSTALL_DIR)
++if(NOT DEFINED LOCALE_INSTALL_DIR)
++ set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
++endif(NOT DEFINED LOCALE_INSTALL_DIR)
++
+ # IF( DEBUG_BUILD )
+ # SET( CMAKE_BUILD_TYPE "Debug" )
+ # ELSE( DEBUG_BUILD )
+--- a/sources/CMakeLists.txt
++++ b/sources/CMakeLists.txt
+@@ -153,13 +153,13 @@ TARGET_LINK_LIBRARIES( ${target} ${XERCE
+
+ INSTALL(
+ TARGETS ${target}
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ )
+ # FIXME: Do not run for OS X framework
+ INSTALL(
+ FILES ${PUBLIC_HEADER}
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${target}
++ DESTINATION ${INCLUDE_INSTALL_DIR}
+ )
+
diff --git a/debian/patches/pkgconfig-support.diff
b/debian/patches/pkgconfig-support.diff
index 91e3828..efc490b 100644
--- a/debian/patches/pkgconfig-support.diff
+++ b/debian/patches/pkgconfig-support.diff
@@ -2,7 +2,7 @@ Description: add pkg-config support for libcitygml
Author: YunQiang Su <wzss...@gmail.com>
Last-Update: 2011-06-13
--- /dev/null
-+++ b/src/citygml.pc.cmake
++++ b/sources/citygml.pc.cmake
@@ -0,0 +1,11 @@
+prefix=${CMAKE_INSTALL_PREFIX}
+exec_prefix=${BIN_INSTALL_DIR}
@@ -12,6 +12,15 @@ Last-Update: 2011-06-13
+Name: citygml
+Description: Read and Write CityGML files
+Requires: libxml-2.0 glu
-+Version: ${PACKAGE_VERSION}
++Version: ${META_VERSION}
+Libs: -L${LIB_INSTALL_DIR} -lcitygml
+Cflags: -I${INCLUDE_INSTALL_DIR}
+--- a/sources/CMakeLists.txt
++++ b/sources/CMakeLists.txt
+@@ -163,3 +163,6 @@ INSTALL(
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+ )
+
++configure_file(citygml.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc DESTINATION
${LIB_INSTALL_DIR}/pkgconfig)
++
diff --git a/debian/patches/rewrite_cmake.diff
b/debian/patches/rewrite_cmake.diff
deleted file mode 100644
index 204054a..0000000
--- a/debian/patches/rewrite_cmake.diff
+++ /dev/null
@@ -1,312 +0,0 @@
-Description: Rewrite CMake build system to support pkg-config.
-Author: YunQiang Su <wzss...@gmail.com>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,143 +1,163 @@
-+project ( libcitygml )
-+cmake_minimum_required(VERSION 2.6.3)
-+set(TARNAME libcitygml)
-+
-+# program name, version etc
-+set(LIBCITYGML_API_VERSION "0.1.4")
-+
-+set(LIBCITYGML_ABI_VERSION "0.0.0")
-+set(LIBCITYGML_ABI_MAJOR_VERSION "0")
-+
-+set(PACKAGE_NAME "${TARNAME}")
-+set(PACKAGE_TARNAME "${TARNAME}")
-+set(PACKAGE_VERSION, ${LIBCITYGML_API_VERSION})
-+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-+set(PACKAGE_BUGREPORT "http://code.google.com/p/libcitygml/issues/list";)
-+
-+find_package(PkgConfig REQUIRED)
-+
-+if(NOT DEFINED BIN_INSTALL_DIR)
-+ set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
-+endif(NOT DEFINED BIN_INSTALL_DIR)
-+if(NOT DEFINED LIB_INSTALL_DIR)
-+ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+endif(NOT DEFINED LIB_INSTALL_DIR)
-+if(NOT DEFINED DATA_INSTALL_DIR)
-+ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share")
-+endif(NOT DEFINED DATA_INSTALL_DIR)
-+if(NOT DEFINED INCLUDE_INSTALL_DIR)
-+ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
-+endif(NOT DEFINED INCLUDE_INSTALL_DIR)
-+if(NOT DEFINED MAN_INSTALL_DIR)
-+ set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man")
-+endif(NOT DEFINED MAN_INSTALL_DIR)
-+if(NOT DEFINED RESOURCE_INSTALL_DIR)
-+ set(RESOURCE_INSTALL_DIR
"${DATA_INSTALL_DIR}/libcitygml${LIBcitygml_ABI_MAJOR_VERSION}/resource/")
-+endif(NOT DEFINED RESOURCE_INSTALL_DIR)
-+if(NOT DEFINED LOCALE_INSTALL_DIR)
-+ set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
-+endif(NOT DEFINED LOCALE_INSTALL_DIR)
-+
-+
-+####################################################
-+# libcitygml
-+
-+pkg_check_modules(LIBXML2 REQUIRED libxml-2.0)
-+ADD_DEFINITIONS( -DUSE_LIBXML2 )
-+
-+pkg_check_modules(GLU REQUIRED glu)
-+
-+option(GDAL "GDAL support" ON)
-+FIND_PACKAGE( GDAL )
-+IF( GDAL AND GDAL_FOUND )
-+ ADD_DEFINITIONS( -DUSE_GDAL )
-+ message(STATUS "Libgdal support: ON" )
-+ELSE( GDAL AND GDAL_FOUND )
-+ SET(GDAL_INCLUDE_DIR " ")
-+ SET(GDAL_LIBRARY " ")
-+ message(STATUS "Libgdal support: OFF" )
-+ENDIF( GDAL AND GDAL_FOUND )
-+
-+include_directories(
-+ ${LIBXML2_INCLUDE_DIRS}
-+ ${GLU_INCLUDE_DIRS}
-+ ${GDAL_INCLUDE_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/include
-+)
-+set(libcitygml_SRC
-+ src/citymodel.cpp
-+ src/parser.cpp
-+ src/parserxercesc.cpp
-+ src/parserlibxml2.cpp
-+ src/tesselator.cpp
-+)
-+
-+add_library(citygml SHARED ${libcitygml_SRC})
-+target_link_libraries(citygml ${LIBXML2_LIBRARIES} ${GLU_LIBRARIES})
-+IF( GDAL AND GDAL_FOUND )
-+ target_link_libraries(citygml ${GDAL_LIBRARY})
-+ENDIF( GDAL AND GDAL_FOUND )
-+
-+set_target_properties(citygml PROPERTIES
-+ VERSION ${LIBCITYGML_ABI_VERSION}
-+ SOVERSION ${LIBCITYGML_ABI_MAJOR_VERSION}
-+)
-+
-+add_library(citygml-static STATIC ${libcitygml_SRC})
-+SET_TARGET_PROPERTIES(citygml-static PROPERTIES OUTPUT_NAME "citygml")
-+SET_TARGET_PROPERTIES(citygml-static PROPERTIES PREFIX "lib")
-+
-+install(TARGETS citygml citygml-static
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-+file(GLOB citygml_INCLUDES "include/*.h")
-+install(FILES ${citygml_INCLUDES} DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel)
-+
-+configure_file(./src/citygml.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc DESTINATION
${LIB_INSTALL_DIR}/pkgconfig)
-+
-+#######################################################################################
-+# test/citygml2vrml/
-+include_directories(
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/include
-+)
-+
-+set(citygml2vrml_SRC
-+ test/citygml2vrml/citygml2vrml.cpp
-+)
-+
-+add_executable(citygml2vrml ${citygml2vrml_SRC})
-+target_link_libraries(citygml2vrml citygml)
-+install(TARGETS citygml2vrml RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-+
-+########################################################################################
-+# test/citygmltest.cpp
-+include_directories(
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/include
-+)
-+
-+set(citygmltest_SRC
-+ test/citygmltest.cpp
-+)
-+
-+add_executable(citygmltest ${citygmltest_SRC})
-+target_link_libraries(citygmltest citygml)
-+install(TARGETS citygmltest RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-+
-+
-+########################################################################################
-+# test/osgplugin/
-+option(OSG "Build OpenSceneGraph plugin" ON)
-+FIND_PACKAGE( OpenSceneGraph )
-+pkg_search_module(OSGPC openscenegraph)
-+IF( OSG AND OPENSCENEGRAPH_FOUND )
-+ include_directories(
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/include
-+ ${OPENSCENEGRAPH_INCLUDE_DIRS}
-+ )
-+
-+ set(ReaderWriterCityGML_SRC
-+ test/osgplugin/ReaderWriterCityGML.cpp
-+ )
-+
-+ add_library(ReaderWriterCityGML SHARED ${ReaderWriterCityGML_SRC})
-+ SET_TARGET_PROPERTIES(ReaderWriterCityGML PROPERTIES PREFIX "")
-+ target_link_libraries(ReaderWriterCityGML citygml
${OPENSCENEGRAPH_LIBRARIES})
-+
-+ add_library(ReaderWriterCityGML-static STATIC
${ReaderWriterCityGML_SRC})
-+ SET_TARGET_PROPERTIES(ReaderWriterCityGML-static PROPERTIES OUTPUT_NAME
"ReaderWriterCityGML")
-+ SET_TARGET_PROPERTIES(ReaderWriterCityGML-static PROPERTIES PREFIX "")
-+
-+ install(TARGETS ReaderWriterCityGML ReaderWriterCityGML-static
-+ LIBRARY DESTINATION
${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}
-+ ARCHIVE DESTINATION
${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION})
-+ENDIF( OSG AND OPENSCENEGRAPH_FOUND )
-
--IF(WIN32)
-- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR)
--ELSE(WIN32)
-- IF(APPLE)
-- CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
-- IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4
AND ${CMAKE_PATCH_VERSION} LESS 7)
-- MESSAGE("Warning: A critical CMake bug exists in 2.4.6 and below.
Trying to build Universal Binaries will result in a compile error that seems
unrelated. Either avoid building Universal Binaries by changing the
CMAKE_OSX_ARCHITECTURES field to list only your architecture, or upgrade to the
current CVS version of CMake or a newer stable version if it exists.")
-- ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL
4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-- ELSE(APPLE)
-- CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
-- ENDIF(APPLE)
--ENDIF(WIN32)
--
--PROJECT ( libcitygml )
--
--SET( CMAKE_MODULE_PATH
"${libcitygml_SOURCE_DIR}/CMakeModules/;${CMAKE_MODULE_PATH}" )
--
--IF(WIN32)
--
-- IF(MSVC)
-- # This option is to enable the /MP switch for Visual Studio 2005 and
above compilers
-- OPTION(WIN32_USE_MP "Set to ON to build libcitygml with the /MP
option (Visual Studio 2005 and above)." OFF)
-- MARK_AS_ADVANCED(WIN32_USE_MP)
-- IF(WIN32_USE_MP)
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-- ENDIF(WIN32_USE_MP)
--
-- # More MSVC specific compilation flags
-- ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
-- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
-- ENDIF(MSVC)
--
-- # Both Cygwin and Msys need -DNOMINMAX ???
-- IF(UNIX)
-- ADD_DEFINITIONS(-DNOMINMAX)
-- ENDIF(UNIX)
--########################################################################################################
--# the foolowing options are MSVC specific,
--# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that
should allow to run examples and application
--# fron bin folder without requiring installation step.
--# it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files,
leaving .lib files untouched in lib
--# it also use a hack to get rid of Debug and Release folder in MSVC projects
--# all the .dll and .pdb are in bin and all the .lib and .exp are in lib
--#
--# the second option disable incremental linking in debug build , that is
enabled by default by CMake
--##########################################################################################################
--
-- IF(MSVC)
-- # IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL
4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-- # MESSAGE("Warning: disabling versioned options 2.4.6 exibits
inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at
least to 2.4.7")
-- # SET(OSG_MSVC_VERSIONED_DLL OFF)
-- # SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
-- # ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION}
EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-- OPTION(LIBCITYGML_MSVC_VERSIONED_DLL "Set to ON to build
libcitygml with versioned dll names" ON)
-- MARK_AS_ADVANCED(LIBCITYGML_MSVC_VERSIONED_DLL)
-- OPTION(LIBCITYGML_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to
build libcitygml without incremental linking in debug (release is off by
default)" ON)
-- MARK_AS_ADVANCED(LIBCITYGML_MSVC_DEBUG_INCREMENTAL_LINK)
-- IF(NOT LIBCITYGML_MSVC_DEBUG_INCREMENTAL_LINK)
-- SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-- SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-- ENDIF(NOT LIBCITYGML_MSVC_DEBUG_INCREMENTAL_LINK)
-- # ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION}
EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-- ENDIF(MSVC)
--ENDIF(WIN32)
--
--IF(MSVC_IDE)
-- # From CMake 2.8.2, new way to manage output generation dirs !
-- # SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../")
-- SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/bin)
-- SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/bin)
--
-- SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/lib)
-- SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/lib)
--
-- SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/bin)
-- SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/bin)
--ENDIF(MSVC_IDE)
--
--SET(CMAKE_DEBUG_POSTFIX "d")
--
--# Dynamic vs Static Linking
--OPTION(LIBCITYGML_DYNAMIC "Set to ON to build libcitygml for dynamic linking.
Use OFF for static." OFF)
--IF (LIBCITYGML_DYNAMIC)
-- SET(LIBCITYGML_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
--ELSE (LIBCITYGML_DYNAMIC)
-- SET(LIBCITYGML_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
--ENDIF(LIBCITYGML_DYNAMIC)
--
--SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
--MAKE_DIRECTORY(${OUTPUT_BINDIR})
--SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
--
--SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
--MAKE_DIRECTORY(${OUTPUT_LIBDIR})
--SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
--
--# IF( DEBUG_BUILD )
-- # SET( CMAKE_BUILD_TYPE "Debug" )
--# ELSE( DEBUG_BUILD )
-- # SET( CMAKE_BUILD_TYPE "Release" )
--# ENDIF( DEBUG_BUILD )
--
--OPTION(LIBCITYGML_STATIC_CRT "Set to ON to link libcitygml with the
multithread CRT static library (instead of DLL)." ON)
--
--# xml library
--OPTION(LIBCITYGML_USE_XERCESC "Set to ON to build libcitygml with Xerces-c
library." ON)
--OPTION(LIBCITYGML_USE_LIBXML2 "Set to ON to build libcitygml with LibXml2
library." OFF)
--
--# gdal library
--OPTION(LIBCITYGML_USE_GDAL "Set to ON to build libcitygml with GDAL library
and support coordinates reprojections." OFF)
--
--IF ( LIBCITYGML_USE_XERCESC )
-- IF( LIBCITYGML_USE_LIBXML2 )
-- MESSAGE("Error: You cannot build the library with Xerces-c AND
LibXml2! Xerces library will be used by default.")
-- UNSET( LIBCITYGML_USE_LIBXML2 )
-- ENDIF( LIBCITYGML_USE_LIBXML2 )
--ENDIF( LIBCITYGML_USE_XERCESC )
--
--# core
--ADD_SUBDIRECTORY( src )
--
--# test
--OPTION(LIBCITYGML_TESTS "Set to ON to build libcitygml tests programs." ON)
--IF (LIBCITYGML_TESTS)
-- ADD_SUBDIRECTORY( test )
--ENDIF(LIBCITYGML_TESTS)
--
--OPTION(LIBCITYGML_VRML "Set to ON to build citygml2vrml program." ON)
--IF (LIBCITYGML_VRML)
-- ADD_SUBDIRECTORY( test/citygml2vrml )
--ENDIF(LIBCITYGML_VRML)
--
--#-----------------------------------------------------------------------------
--### uninstall target
--#-----------------------------------------------------------------------------
--CONFIGURE_FILE(
-- "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
-- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-- IMMEDIATE @ONLY)
--ADD_CUSTOM_TARGET(uninstall
-- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 2f5c1b2..b769fc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
-#rewrite_cmake.diff
+install-paths.diff
pkgconfig-support.diff
+soversion.diff
+install-citygmltest.diff
information-typo.diff
diff --git a/debian/patches/soversion.diff b/debian/patches/soversion.diff
new file mode 100644
index 0000000..0e14b12
--- /dev/null
+++ b/debian/patches/soversion.diff
@@ -0,0 +1,17 @@
+Description: Set library VERSION & SOVERSION.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/sources/CMakeLists.txt
++++ b/sources/CMakeLists.txt
+@@ -151,6 +151,11 @@ ADD_LIBRARY( ${target} ${LIBCITYGML_USER
+
+ TARGET_LINK_LIBRARIES( ${target} ${XERCESC_LIBRARIES} ${OPENGL_LIBRARIES}
${GDAL_LIBRARY} )
+
++set_target_properties( ${target} PROPERTIES
++ VERSION ${META_VERSION}
++ SOVERSION ${META_VERSION_MAJOR}
++)
++
+ INSTALL(
+ TARGETS ${target}
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libcitygml.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
