On 2021-10-24 Andreas Metzler <ametz...@bebt.de> wrote:
> The cmake set-up ignores/overrides -DCMAKE_INSTALL_LIBDIR (unless
> FIND_LIBRARY_USE_LIB64_PATHS is set). I am not 100% sure about the
> proper fix but I suspect dropping the whole MYLIB logic and trusting
> modern cmake to do the right thing would work.
Hello,
This seems to work for me, might break other stuff:
--- libpano13-2.9.21~rc1+dfsg.orig/CMakeLists.txt
+++ libpano13-2.9.21~rc1+dfsg/CMakeLists.txt
@@ -287,12 +287,12 @@ if(NOT WIN32)
add_library(pano13 SHARED ${pano13_hdr} ${pano13_src})
target_link_libraries(pano13 ${_common_libs})
set_target_properties(pano13 PROPERTIES VERSION "3.0.0" SOVERSION "3")
- install(TARGETS pano13 LIBRARY DESTINATION ${MYLIB} COMPONENT libraries)
+ install(TARGETS pano13 LIBRARY COMPONENT libraries)
set(_pano_target pano13)
#create and install static library
add_library(pano13a STATIC ${pano13_hdr} ${pano13_src})
set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13)
- install(TARGETS pano13a ARCHIVE DESTINATION ${MYLIB} COMPONENT libraries)
+ install(TARGETS pano13a ARCHIVE COMPONENT libraries)
else()
IF(BUILD_DLL)
# Create and install shared library
and
--- libpano13-2.9.21~rc1+dfsg.orig/CMakeLists.txt
+++ libpano13-2.9.21~rc1+dfsg/CMakeLists.txt
@@ -401,7 +401,8 @@ set(LIB_ZLIB ${ZLIB_LIBRARY})
set(LIB_PNG ${PNG_LIBRARY})
set(VERSION ${PACKAGE_VERSION})
configure_file("${TOP_SRC_DIR}/libpano13.pc.in"
"${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY)
-install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION
"${MYLIB}/pkgconfig" COMPONENT libraries)
+install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION
+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT libraries)
set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}")
Tools are not installed to DESTDIR/usr/bin by
cd obj-x86_64-linux-gnu && make -j1 install
DESTDIR=/dev/shm/PANO/libpano13-2.9.21/debian/tmp AM_UPDATE_INFO_DIR=no
"INSTALL=install --strip-program=true"
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to hugin-ptx+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/YXVUnLGYQymaRBqz%40argenau.bebt.de.
