|
 |
d47356b |
diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.txt
|
|
|
d47356b |
--- geos-3.8.1/CMakeLists.txt 2020-01-05 17:44:53.000000000 +0100
|
|
|
d47356b |
+++ geos-3.8.1-new/CMakeLists.txt 2020-03-11 13:01:25.940873494 +0100
|
|
|
83b3ce5 |
@@ -281,16 +281,16 @@ configure_file(cmake/geos-config.cmake
|
|
|
83b3ce5 |
|
|
|
83b3ce5 |
install(TARGETS geos geos_cxx_flags
|
|
|
83b3ce5 |
EXPORT geos-targets
|
|
|
83b3ce5 |
- LIBRARY DESTINATION lib NAMELINK_SKIP
|
|
|
83b3ce5 |
- ARCHIVE DESTINATION lib
|
|
|
83b3ce5 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} NAMELINK_SKIP
|
|
|
83b3ce5 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
|
83b3ce5 |
RUNTIME DESTINATION bin
|
|
|
83b3ce5 |
INCLUDES DESTINATION include
|
|
|
83b3ce5 |
)
|
|
|
83b3ce5 |
|
|
|
83b3ce5 |
install(TARGETS geos_c
|
|
|
83b3ce5 |
EXPORT geos-targets
|
|
|
83b3ce5 |
- LIBRARY DESTINATION lib
|
|
|
83b3ce5 |
- ARCHIVE DESTINATION lib
|
|
|
83b3ce5 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
|
83b3ce5 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
|
83b3ce5 |
RUNTIME DESTINATION bin
|
|
|
83b3ce5 |
INCLUDES DESTINATION include
|
|
|
83b3ce5 |
)
|
|
|
83b3ce5 |
@@ -298,12 +298,12 @@ install(TARGETS geos_c
|
|
|
83b3ce5 |
install(EXPORT geos-targets
|
|
|
83b3ce5 |
FILE geos-targets.cmake
|
|
|
83b3ce5 |
NAMESPACE GEOS::
|
|
|
83b3ce5 |
- DESTINATION lib/cmake/GEOS)
|
|
|
83b3ce5 |
+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS)
|
|
|
83b3ce5 |
|
|
|
83b3ce5 |
install(FILES
|
|
|
83b3ce5 |
"${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
|
|
|
83b3ce5 |
"${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
|
|
|
83b3ce5 |
- DESTINATION lib/cmake/GEOS)
|
|
|
83b3ce5 |
+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS)
|
|
|
83b3ce5 |
install(DIRECTORY
|
|
|
83b3ce5 |
"${CMAKE_CURRENT_LIST_DIR}/include/geos"
|
|
|
83b3ce5 |
"${CMAKE_CURRENT_BINARY_DIR}/include/geos"
|
|
|
d47356b |
diff -rupN --no-dereference geos-3.8.1/tools/geos-config.cmake geos-3.8.1-new/tools/geos-config.cmake
|
|
|
d47356b |
--- geos-3.8.1/tools/geos-config.cmake 2019-10-29 23:44:33.000000000 +0100
|
|
|
d47356b |
+++ geos-3.8.1-new/tools/geos-config.cmake 2020-03-11 13:01:25.940873494 +0100
|
|
|
83b3ce5 |
@@ -2,7 +2,7 @@
|
|
|
83b3ce5 |
|
|
|
83b3ce5 |
prefix=@CMAKE_INSTALL_PREFIX@
|
|
|
83b3ce5 |
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
|
|
|
83b3ce5 |
-libdir=@CMAKE_INSTALL_PREFIX@/lib
|
|
|
d47356b |
+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@@LIB_SUFFIX@
|
|
|
83b3ce5 |
|
|
|
83b3ce5 |
usage()
|
|
|
83b3ce5 |
{
|
|
|
83b3ce5 |
@@ -44,22 +44,22 @@ case $1 in
|
|
|
83b3ce5 |
echo -I@CMAKE_INSTALL_PREFIX@/include
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--libs)
|
|
|
83b3ce5 |
- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos-@GEOS_VERSION_MAJOR@
|
|
|
83b3ce5 |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos-@GEOS_VERSION_MAJOR@
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--clibs)
|
|
|
83b3ce5 |
- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c
|
|
|
83b3ce5 |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--cclibs)
|
|
|
83b3ce5 |
- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos
|
|
|
83b3ce5 |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--static-clibs)
|
|
|
83b3ce5 |
- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c -lgeos -lm
|
|
|
83b3ce5 |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c -lgeos -lm
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--static-cclibs)
|
|
|
83b3ce5 |
- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos -lm
|
|
|
83b3ce5 |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos -lm
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--ldflags)
|
|
|
d47356b |
- echo -L@CMAKE_INSTALL_PREFIX@/lib
|
|
|
d47356b |
+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
|
|
|
83b3ce5 |
;;
|
|
|
83b3ce5 |
--includes)
|
|
|
83b3ce5 |
echo @CMAKE_INSTALL_PREFIX@/include
|