[Git][debian-gis-team/libcitygml][upstream] New upstream version 2.4.2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Mar 15 05:40:12 GMT 2022
Bas Couwenberg pushed to branch upstream at Debian GIS Project / libcitygml
Commits:
dc57d6c0 by Bas Couwenberg at 2022-03-15T05:43:03+01:00
New upstream version 2.4.2
- - - - -
4 changed files:
- sources/CMakeLists.txt
- sources/citygml.pc.cmake
- + sources/citygmlConfig.cmake.in
- test/citygmltest.cpp
Changes:
=====================================
sources/CMakeLists.txt
=====================================
@@ -205,7 +205,10 @@ generate_export_header(citygml
EXPORT_MACRO_NAME LIBCITYGML_EXPORT
EXPORT_FILE_NAME ${EXPORT_HEADER_FILE_NAME})
-TARGET_LINK_LIBRARIES( ${target} ${XERCESC_LIBRARIES} ${OPENGL_LIBRARIES} ${GDAL_LIBRARY} )
+TARGET_LINK_LIBRARIES( ${target} PUBLIC ${XERCESC_LIBRARIES} ${OPENGL_LIBRARIES} )
+if(LIBCITYGML_USE_GDAL)
+ TARGET_LINK_LIBRARIES( ${target} PUBLIC ${GDAL_LIBRARY} )
+endif(LIBCITYGML_USE_GDAL)
set_target_properties( ${target} PROPERTIES
VERSION ${META_VERSION}
@@ -222,19 +225,49 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR)
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/citygml")
endif(NOT DEFINED INCLUDE_INSTALL_DIR)
+if(WIN32)
+ set(CONFIG_INSTALL_DIR "cmake")
+else()
+ set(CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/citygml")
+endif()
+
INSTALL(
TARGETS ${target}
+ EXPORT citygmlConfigInternal
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ COMPONENT "runtime"
+)
+INSTALL(
+ EXPORT citygmlConfigInternal
+ DESTINATION "${CONFIG_INSTALL_DIR}"
+ NAMESPACE "citygml::"
+ COMPONENT "development"
)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/citygmlConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/citygmlConfig.cmake"
+ INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}")
+write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/citygmlConfigVersion.cmake
+ VERSION "${META_VERSION}"
+ COMPATIBILITY SameMajorVersion)
+INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/citygmlConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/citygmlConfigVersion.cmake
+ DESTINATION "${CONFIG_INSTALL_DIR}"
+ COMPONENT "development"
+)
# FIXME: Do not run for OS X framework
INSTALL(
FILES
${PUBLIC_HEADER}
DESTINATION ${INCLUDE_INSTALL_DIR}
+ COMPONENT "development"
)
INSTALL(
@@ -242,6 +275,7 @@ INSTALL(
${EXPORT_HEADER_FILE_NAME}
DESTINATION
${INCLUDE_INSTALL_DIR}
+ COMPONENT "development"
)
if (LIBCITYGML_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -250,7 +284,17 @@ else()
set(LIBCITYGML_POSTFIX "")
endif()
+set(PKG_CONFIG_REQUIRES "xerces-c glu")
+
+if (LIBCITYGML_USE_GDAL)
+ set(PKG_CONFIG_REQUIRES "${PKG_CONFIG_REQUIRES} gdal")
+endif()
+
configure_file(citygml.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc
+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
+ COMPONENT "development"
+)
=====================================
sources/citygml.pc.cmake
=====================================
@@ -5,7 +5,7 @@ includedir=${INCLUDE_INSTALL_DIR}
Name: citygml
Description: Read and Write CityGML files
-Requires: libxml-2.0 glu
+Requires: ${PKG_CONFIG_REQUIRES}
Version: ${META_VERSION}
Libs: -L${LIB_INSTALL_DIR} -lcitygml${LIBCITYGML_POSTFIX}
Cflags: -I${INCLUDE_INSTALL_DIR}
=====================================
sources/citygmlConfig.cmake.in
=====================================
@@ -0,0 +1,9 @@
+ at PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/citygmlConfigInternal.cmake")
+
+set(CITYGML_ROOT_DIR ${PACKAGE_PREFIX_DIR})
+set(CITYGML_LIBRARIES citygml::citygml)
+set(CITYGML_DYNAMIC @LIBCITYGML_DYNAMIC@)
+get_property(CITYGML_INCLUDE_DIRS TARGET citygml::citygml PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+set(CITYGML_LIBRARY_DIRS "")
=====================================
test/citygmltest.cpp
=====================================
@@ -37,7 +37,7 @@ void usage()
<< " SolitaryVegetationObject, WaterBody, TINRelief, LandUse," << std::endl
<< " Tunnel, Bridge, BridgeConstructionElement," << std::endl
<< " BridgeInstallation, BridgePart, All" << std::endl
- << " and seperators |,&,~." << std::endl
+ << " and separators |,&,~." << std::endl
<< " Examples:" << std::endl
<< " \"All&~Track&~Room\" to parse everything but tracks & rooms" << std::endl
<< " \"Road&Railway\" to parse only roads & railways" << std::endl;
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/-/commit/dc57d6c0f8a66a5febcaa3f177649243a5e49711
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/-/commit/dc57d6c0f8a66a5febcaa3f177649243a5e49711
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220315/f2b4213b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list