42c59e68a1
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/geos.git#fa2c57153988ff67537b876785a91fd9d02a18ba
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists.txt
|
|
--- geos-3.9.0/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100
|
|
+++ geos-3.9.0-new/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100
|
|
@@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake
|
|
|
|
install(TARGETS geos geos_cxx_flags
|
|
EXPORT geos-targets
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
RUNTIME DESTINATION bin
|
|
INCLUDES DESTINATION include
|
|
)
|
|
|
|
install(TARGETS geos_c
|
|
EXPORT geos-targets
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
RUNTIME DESTINATION bin
|
|
INCLUDES DESTINATION include
|
|
)
|
|
@@ -317,12 +317,12 @@ install(TARGETS geos_c
|
|
install(EXPORT geos-targets
|
|
FILE geos-targets.cmake
|
|
NAMESPACE GEOS::
|
|
- DESTINATION lib/cmake/GEOS)
|
|
+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS)
|
|
|
|
install(FILES
|
|
"${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
|
|
- DESTINATION lib/cmake/GEOS)
|
|
+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS)
|
|
install(DIRECTORY
|
|
"${CMAKE_CURRENT_LIST_DIR}/include/geos"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/include/geos"
|
|
diff -rupN --no-dereference geos-3.9.0/tools/CMakeLists.txt geos-3.9.0-new/tools/CMakeLists.txt
|
|
--- geos-3.9.0/tools/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100
|
|
+++ geos-3.9.0-new/tools/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100
|
|
@@ -36,7 +36,7 @@ if(NOT MSVC)
|
|
|
|
install(FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/geos.pc
|
|
- DESTINATION lib/pkgconfig)
|
|
+ DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
|
|
|
endif()
|
|
|
|
diff -rupN --no-dereference geos-3.9.0/tools/geos-config.cmake geos-3.9.0-new/tools/geos-config.cmake
|
|
--- geos-3.9.0/tools/geos-config.cmake 2020-07-21 20:07:17.000000000 +0200
|
|
+++ geos-3.9.0-new/tools/geos-config.cmake 2021-03-10 19:25:20.832864575 +0100
|
|
@@ -1,7 +1,7 @@
|
|
#!/bin/sh
|
|
|
|
prefix=@ESCAPED_INSTALL_PREFIX@
|
|
-libdir=${prefix}/lib
|
|
+libdir=${prefix}/lib@LIB_SUFFIX@
|
|
|
|
usage()
|
|
{
|
|
diff -rupN --no-dereference geos-3.9.0/tools/geos.pc.cmake geos-3.9.0-new/tools/geos.pc.cmake
|
|
--- geos-3.9.0/tools/geos.pc.cmake 2020-12-09 18:17:36.000000000 +0100
|
|
+++ geos-3.9.0-new/tools/geos.pc.cmake 2021-03-10 19:25:20.833864575 +0100
|
|
@@ -8,4 +8,4 @@ Description: Geometry Engine, Open Sourc
|
|
Requires:
|
|
Version: @GEOS_VERSION@
|
|
Cflags: -I${includedir}
|
|
-Libs: -L${libdir} -lgeos_c
|
|
+Libs: -L${libdir}@LIB_SUFFIX@ -lgeos_c
|