[Git][debian-gis-team/jeolib-jiplib][upstream] New upstream version 1.2.1+ds
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Jul 27 16:32:06 BST 2026
Bas Couwenberg pushed to branch upstream at Debian GIS Project / jeolib-jiplib
Commits:
8613b648 by Bas Couwenberg at 2026-07-27T17:13:12+02:00
New upstream version 1.2.1+ds
- - - - -
5 changed files:
- CMakeLists.txt
- cmake/config.h
- doc/conf.py
- src/python/__init__.py
- src/python/setup.py
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -25,11 +25,12 @@ project(jiplib LANGUAGES CXX)
# --- 1. Project Metadata ---
set(JIPLIB_VERSION_MAJOR 1)
set(JIPLIB_VERSION_MINOR 2)
-set(JIPLIB_VERSION_PATCH 0)
+set(JIPLIB_VERSION_PATCH 1)
set(JIPLIB_VERSION "${JIPLIB_VERSION_MAJOR}.${JIPLIB_VERSION_MINOR}.${JIPLIB_VERSION_PATCH}")
set(JIPLIB_SOVERSION "${JIPLIB_VERSION_MAJOR}")
# --- 2. Build Settings ---
+option(STANDALONE_BUILD "Build jiplib as a standalone system library" OFF)
option(BUILD_SHARED_LIBS "Build with shared library" ON)
find_package(Python REQUIRED COMPONENTS Interpreter Development.Module NumPy)
@@ -40,8 +41,11 @@ if(TARGET miallib)
set(MIALLIB_FOUND TRUE)
set(MIALLIB_TARGET miallib)
else()
- # 2. If building jiplib STANDALONE, try to find it on the system
- find_package(MIALLIB 1.2.0 QUIET NO_DEFAULT_PATH)
+ if(STANDALONE_BUILD)
+ find_package(MIALLIB 1.2.1 REQUIRED)
+ else()
+ find_package(MIALLIB 1.2.1 QUIET NO_DEFAULT_PATH)
+ endif()
message(STATUS "Found MIALLIB_LIBRARY: ${MIALLIB_LIBRARIES}")
get_cmake_property(_vars VARIABLES)
@@ -351,7 +355,7 @@ if(NOT JIMLIST_CC_CONTENT MATCHES "${JIMLIST_LINE}")
endif()
message(STATUS "****** Jim.cc and JimList.cc include lines verified.")
-find_package(Boost REQUIRED CONFIG COMPONENTS filesystem system serialization)
+find_package(Boost REQUIRED CONFIG COMPONENTS filesystem serialization)
find_package(GDAL 3.00 REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(OpenMP REQUIRED)
@@ -384,7 +388,7 @@ INCLUDE(CTest)
SET(JIPLIB_VERSION_MAJOR 1)
SET(JIPLIB_VERSION_MINOR 2)
-SET(JIPLIB_VERSION_PATCH 0)
+SET(JIPLIB_VERSION_PATCH 1)
SET(JIPLIB_VERSION "${JIPLIB_VERSION_MAJOR}.${JIPLIB_VERSION_MINOR}.${JIPLIB_VERSION_PATCH}")
SET(PACKAGE_VERSION "${JIPLIB_VERSION}")
SET(JIPLIB_SOVERSION "${JIPLIB_VERSION_MAJOR}")
@@ -394,22 +398,27 @@ SET(CLASSIF 0 CACHE STRING "set a variable that can be used in Jim.cc")
SET(ODOITHIN 0 CACHE STRING "set a variable that can be used in Jim.cc")
SET(MCISRG 1 CACHE STRING "set a variable that can be used in Jim.cc")
-SET(BUILD_WITH_LIBLAS FALSE CACHE BOOL "Choose if jiplib is to be built with liblas")
-SET(BUILD_WITH_FANN TRUE CACHE BOOL "Choose if jiplib is to be built with fann")
-SET(BUILD_WITH_PYTHON TRUE CACHE BOOL "Choose if jiplib is to be built with PYTHON support")
-SET(PROCESS_IN_PARALLEL TRUE CACHE BOOL "Choose if jiplib should be run in parallel")
+option(BUILD_WITH_LIBLAS "Choose if jiplib is to be built with liblas" OFF)
+option(BUILD_WITH_FANN "Choose if jiplib is to be built with fann" ON)
+option(BUILD_WITH_PYTHON "Choose if jiplib is to be built with PYTHON support" ON)
+option(PROCESS_IN_PARALLEL "Choose if jiplib should be run in parallel" ON)
+
#from https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
#By default if you don't change any RPATH related settings, CMake will
# link the executables and shared libraries with full RPATH to all used
# libraries in the build tree. When installing, it will clear the RPATH of
# these targets so they are installed with an empty RPATH
-set_target_properties(jiplib PROPERTIES INSTALL_RPATH "$ORIGIN")
+if(TARGET jiplib)
+ set_target_properties(jiplib PROPERTIES
+ INSTALL_RPATH "$ORIGIN"
+ BUILD_WITH_INSTALL_RPATH TRUE
+ )
+endif()
-SET(PROJECT_INCLUDE_DIR include/jiplib)
-SET(PROJECT_TEST_DIR test)
+set(PROJECT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/jiplib")
+set(PROJECT_TEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/test")
SET(CMAKE_COLOR_MAKEFILE ON)
-
SET(MIAL_BOOL 1)
option (BUILD_SHARED_LIBS "Build with shared library" ON)
@@ -893,7 +902,6 @@ target_link_libraries(${JIPLIB_LIB_NAME}
PkgConfig::JSONCPP
OpenMP::OpenMP_CXX
Boost::filesystem
- Boost::system
Boost::serialization
)
@@ -1016,3 +1024,55 @@ set_target_properties(jiplib PROPERTIES OUTPUT_NAME "jiplib")
include(GNUInstallDirs)
set_target_properties(jiplib_python PROPERTIES INSTALL_RPATH "$ORIGIN")
+
+if(STANDALONE_BUILD)
+ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
+ LIBRARY
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT libraries
+ PUBLIC_HEADER
+ DESTINATION include/${JIPLIB_LIB_NAME}
+ COMPONENT headers
+ )
+
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jiplib.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
+
+ if(BUILD_WITH_PYTHON)
+ SET(PYTHON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/python)
+ SET(JIPLIB_INIT ${PYTHON_SOURCE_DIR}/__init__.py)
+
+ if(CREATE_WHEEL)
+ MESSAGE(STATUS "creating python wheel: ${CREATE_WHEEL}")
+ MESSAGE(STATUS "PROJECT_SOURCE_DIR: ${PROJECT_SOURCE_DIR}")
+ MESSAGE(STATUS "CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
+ MESSAGE(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+ MESSAGE(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
+ MESSAGE(STATUS "CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}")
+ MESSAGE(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
+ SET(WHEEL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})
+
+ # add_custom_command(TARGET ${JIPLIB_LIB_NAME}
+ add_custom_command(TARGET jiplib_python
+ POST_BUILD
+ COMMAND mkdir -p ${WHEEL_DIR}
+ COMMAND cp ${JIPLIB_INIT} ${WHEEL_DIR}
+ COMMAND cp ${PYTHON_SOURCE_DIR}/setup.py ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${WHEEL_DIR}
+ COMMAND cp ${CMAKE_BINARY_DIR}/_${JIPLIB_LIB_NAME}.so ${WHEEL_DIR}
+ COMMAND cp ${CMAKE_BINARY_DIR}/lib${JIPLIB_LIB_NAME}.so.${JIPLIB_VERSION_MAJOR} ${WHEEL_DIR}
+ COMMAND cp ${MIALLIB_LIBRARIES}.${MIALLIB_VERSION_MAJOR} ${WHEEL_DIR}
+ COMMAND cp ${CMAKE_BINARY_DIR}/${JIPLIB_LIB_NAME}.py ${WHEEL_DIR}
+ COMMAND cp ${PROJECT_SOURCE_DIR}/README.md ${WHEEL_DIR}
+ COMMAND ${Python_EXECUTABLE} -m pip wheel ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND rm -rf ${WHEEL_DIR}
+ )
+ endif(CREATE_WHEEL)
+ endif(BUILD_WITH_PYTHON)
+
+ INSTALL(CODE
+ "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
+ COMPONENT wheels
+ )
+endif()
=====================================
cmake/config.h
=====================================
@@ -1,6 +1,6 @@
// the configured options and settings for jiplib
#define JIPLIB_VERSION_MAJOR 1
-#define JIPLIB_VERSION_MINOR 1
-#define JIPLIB_VERSION_PATCH 0
+#define JIPLIB_VERSION_MINOR 2
+#define JIPLIB_VERSION_PATCH 1
#define VERSION 1
#define CLASSIF 0
=====================================
doc/conf.py
=====================================
@@ -67,9 +67,9 @@ author = u'Pieter Kempeneers and Pierre Soille'
# built documents.
#
# The short X.Y version.
-version = u'1.2.0'
+version = u'1.2.1'
# The full version, including alpha/beta/rc tags.
-release = u'1.2.0'
+release = u'1.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
=====================================
src/python/__init__.py
=====================================
@@ -23,4 +23,4 @@ from __future__ import absolute_import
from .jiplib import *
-__version__ = '1.2.0'
+__version__ = '1.2.1'
=====================================
src/python/setup.py
=====================================
@@ -27,7 +27,7 @@ from setuptools import find_packages
setup(
name='jiplib',
- version='1.2.0',
+ version='1.2.1',
author='Pieter Kempeneers',
author_email='pieter.kempeneers at ec.europa.eu',
url='https://jeodpp.jrc.ec.europa.eu/apps/gitlab/JIPlib/jiplib',
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/8613b64839019a327e850fe69371b1619c8bae58
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/8613b64839019a327e850fe69371b1619c8bae58
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260727/2a5f277b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list