f9085eff7d
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#a18ed7912542ab57de0bd6c8599c27db46a19d73
64 lines
2.1 KiB
Diff
64 lines
2.1 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 01:07:19.000000000 +0100
|
|
+++ geos-3.9.0-new/CMakeLists.txt 2020-12-10 12:23:21.466732306 +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-11-30 20:08:53.000000000 +0100
|
|
+++ geos-3.9.0-new/tools/CMakeLists.txt 2020-12-10 12:23:21.466732306 +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-11-30 20:08:53.000000000 +0100
|
|
+++ geos-3.9.0-new/tools/geos-config.cmake 2020-12-10 12:23:21.466732306 +0100
|
|
@@ -1,7 +1,7 @@
|
|
#!/bin/sh
|
|
|
|
prefix=@ESCAPED_INSTALL_PREFIX@
|
|
-libdir=${prefix}/lib
|
|
+libdir=${prefix}/lib@LIB_SUFFIX
|
|
|
|
usage()
|
|
{
|