Bas Couwenberg pushed to branch upstream at Debian GIS Project / proj
Commits:
9aedeb37 by Bas Couwenberg at 2025-03-13T16:15:47+01:00
New upstream version 9.6.0~rc3
- - - - -
2 changed files:
- CMakeLists.txt
- src/lib_proj.cmake
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -156,6 +156,13 @@ include(ProjConfig)
include(ProjMac)
include(policies)
+##############################################
+### SWITCH BETWEEN STATIC OR SHARED LIBRARY###
+##############################################
+
+# default config is shared
+option(BUILD_SHARED_LIBS "Build PROJ library shared." ON)
+
################################################################################
# Check for nlohmann_json
################################################################################
@@ -368,6 +375,9 @@ function (is_sharp_embed_available res)
endfunction()
is_sharp_embed_available(IS_SHARP_EMBED_AVAILABLE_RES)
+if (NOT DEFINED BUILD_SHARED_LIBS)
+ message(FATAL_ERROR "BUILD_SHARED_LIBS should be set")
+endif()
if (NOT BUILD_SHARED_LIBS)
set(DEFAULT_EMBED_RESOURCE_FILES ON)
else()
=====================================
src/lib_proj.cmake
=====================================
@@ -1,13 +1,5 @@
message(STATUS "Configuring proj library:")
-##############################################
-### SWITCH BETWEEN STATIC OR SHARED LIBRARY###
-##############################################
-
-# default config is shared
-option(BUILD_SHARED_LIBS
- "Build PROJ library shared." ON)
-
find_package(Threads QUIET)
if(Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
add_definitions(-DPROJ_HAS_PTHREADS)
View it on GitLab:
https://salsa.debian.org/debian-gis-team/proj/-/commit/9aedeb37146c2a4d8db6d4c2aa8be10da2e472c2
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/proj/-/commit/9aedeb37146c2a4d8db6d4c2aa8be10da2e472c2
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
