[Git][debian-gis-team/jeolib-miallib][upstream] New upstream version 1.2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Jul 24 18:28:32 BST 2026
Bas Couwenberg pushed to branch upstream at Debian GIS Project / jeolib-miallib
Commits:
2b9ac0c8 by Bas Couwenberg at 2026-07-24T18:45:11+02:00
New upstream version 1.2
- - - - -
3 changed files:
- CMakeLists.txt
- cmake.pc.in
- miallib-config.cmake.in
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
###############################################################################
# Author(s): Pieter.Kempeneers at ec.europa.eu
-# Copyright (C) 2000-2023 European Union (Joint Research Centre)
+# Copyright (C) 2000-2026 European Union (Joint Research Centre)
# This file is part of miallib.
@@ -31,8 +31,8 @@ project(miallib)
set(MIALLIB_LIB_NAME miallib)
set (MIALLIB_VERSION_MAJOR 1)
-set (MIALLIB_VERSION_MINOR 1)
-set (MIALLIB_VERSION_PATCH 7)
+set (MIALLIB_VERSION_MINOR 2)
+set (MIALLIB_VERSION_PATCH 0)
set (MIALLIB_VERSION "${MIALLIB_VERSION_MAJOR}.${MIALLIB_VERSION_MINOR}.${MIALLIB_VERSION_PATCH}")
set (MIALLIB_SOVERSION "${MIALLIB_VERSION_MAJOR}")
@@ -74,12 +74,6 @@ message(STATUS "cmake module path: ${CMAKE_MODULE_PATH}")
set(MIALLIB_SRC_DIR ${PROJECT_SOURCE_DIR}/core/c)
-#simple way to get all src files, but not recommended
-# file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/core/*.c")
-# set(SOURCES
-# ${SRC_FILES}
-# )
-
set(MIALLIB_H
${MIALLIB_SRC_DIR}/miallib_convolve.h
${MIALLIB_SRC_DIR}/miallib_dem.h
@@ -269,18 +263,24 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
option (BUILD_SHARED_LIBS "Build with shared library" ON)
###############################################################################
-# Define the miallib library.
-# add_library( ${MIALLIB_LIB_NAME} ${SRC_FILES})
-add_library(${MIALLIB_LIB_NAME} ${SOURCES})
+
+add_library(${MIALLIB_LIB_NAME} SHARED ${SOURCES})
###############################################################################
+add_library(miallib::miallib ALIAS ${MIALLIB_LIB_NAME})
+
SET_TARGET_PROPERTIES(${MIALLIB_LIB_NAME}
PROPERTIES
- SOVERSION ${MIALLIB_SOVERSION}
VERSION ${MIALLIB_VERSION}
- NAMESPACE ${MIALLIB_LIB_NAME}::
+ SOVERSION ${MIALLIB_SOVERSION}
)
+target_include_directories(${MIALLIB_LIB_NAME} PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/core/c>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+ $<INSTALL_INTERFACE:include>
+)
+
include_directories("core/c")
find_package(PkgConfig REQUIRED)
@@ -289,7 +289,6 @@ find_package(PkgConfig REQUIRED)
# configure a header file to pass some of the CMake settings to the source code
configure_file ( "cmake-config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/core/c/config_miallib.h")
-# configure_file ( "cmake-config.in" "${CMAKE_CURRENT_BINARY_DIR}/miallib-config" @ONLY )
include_directories("${CMAKE_CURRENT_BINARY_DIR}/core/c")# needed for config_miallib.h
add_definitions(-DHAVE_CONFIG_H)
@@ -359,12 +358,10 @@ if(PROCESS_IN_PARALLEL)
find_package(OpenMP REQUIRED)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(PARALLEL_BOOL 1)
message(STATUS "parallel processing: ${PARALLEL_BOOL}")
- SET(CMAKE_C_FLAGS "-DOPENMP=${PARALLEL_BOOL}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENMP=${PARALLEL_BOOL}")
target_link_libraries(${MIALLIB_LIB_NAME} OpenMP::OpenMP_CXX)
- # string(REPLACE ".so" "_omp.so" FFTW_OMP_LIBRARIES "${FFTW_LIBRARIES}")
message(STATUS "FFTW_OMP_LIBRARIES: ${FFTW_OMP_LIBRARIES}")
target_link_libraries(${MIALLIB_LIB_NAME} ${FFTW_OMP_LIBRARIES})
else(PROCESS_IN_PARALLEL)
@@ -375,8 +372,6 @@ endif(PROCESS_IN_PARALLEL)
find_package(PkgConfig REQUIRED)
set(BLA_VENDOR OpenBLAS)
-set(CMAKE_C_FLAGS -fopenmp)
-#find_package(BLAS REQUIRED)
find_package(GSL REQUIRED)
if(GSL_FOUND)
@@ -395,15 +390,29 @@ target_link_libraries(${MIALLIB_LIB_NAME} ${SHAPELIB_LIBRARIES})
add_definitions(-DSHAPE_DLL)
INSTALL(TARGETS ${MIALLIB_LIB_NAME}
- EXPORT "${MIALLIB_LIB_NAME}"
+ EXPORT miallib-targets
COMPONENT libraries
- LIBRARY DESTINATION lib)
-INSTALL(FILES ${MIALLIB_H} DESTINATION include/miallib/)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib-config.cmake
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ PUBLIC_HEADER DESTINATION include/miallib/
+)
+
+INSTALL(EXPORT miallib-targets
+ FILE miallib-targets.cmake
+ NAMESPACE miallib::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/miallib
+ COMPONENT headers
+)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/miallib-config-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/miallib
COMPONENT headers
- )
+)
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib.pc
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
+
+# Export the package to the CMake User Package Registry (Optional but helpful)
+# This allows other projects on your machine to find this build tree
+export(PACKAGE MIALLIB)
=====================================
cmake.pc.in
=====================================
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
includedir=@CMAKE_INSTALL_PREFIX@/include
Name: miallib
=====================================
miallib-config.cmake.in
=====================================
@@ -10,4 +10,6 @@ set_and_check(MIALLIB_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
set_and_check(MIALLIB_LIBRARY "@PACKAGE_LIBRARY_INSTALL_DIR@/libmiallib.so")
set_and_check(MIALLIB_LIBRARIES ${MIALLIB_LIBRARY})
+include("${CMAKE_CURRENT_LIST_DIR}/miallib-targets.cmake")
+
check_required_components(miallib)
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/commit/2b9ac0c85e45d40d9bc7622d66bc77a7d58bfc23
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/commit/2b9ac0c85e45d40d9bc7622d66bc77a7d58bfc23
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/20260724/12c5a9a6/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list