36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From 2333cd804e33e67567b656b847094cd9a8c8fbbf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Sun, 22 Sep 2019 20:58:19 +0200
|
||
|
|
Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library
|
||
|
|
|
||
|
|
Building a shared library doesn't work on all platforms, so instead,
|
||
|
|
let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
|
||
|
|
whether a static or shared library should be built.
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status:
|
||
|
|
https://github.com/libspatialindex/libspatialindex/pull/158]
|
||
|
|
---
|
||
|
|
src/CMakeLists.txt | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index e6b733b..f8a4980 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -194,9 +194,9 @@ if (NOT WITH_STATIC_LASZIP)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
|
||
|
|
+add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES})
|
||
|
|
|
||
|
|
-add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
|
||
|
|
+add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP})
|
||
|
|
|
||
|
|
target_link_libraries(${SIDX_C_LIB_NAME}
|
||
|
|
${SIDX_LIB_NAME}
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|