On 2010-11-02 Harry van der Wolf <hvdw...@gmail.com> wrote: > 2010/11/2 Andreas Metzler <ametz...@downhill.at.eu.org> >> Bruno Postle <br...@postle.net> wrote: >> [...] >>> Yes the libraries are private, for now anyway, we also don't install >>> header files that you would need if they were 'public'. Since >>> nobody should be linking to the libraries we shouldn't be installing >>> the .so symlinks either. [...] >> I will uprovide an updated the patch [...]
> Your current patch of 31st October, which "skips" Apple for it's new > config, builds and works fine on OSX. Thanks for testing. > Hugin on Apple also uses the full library name > (libhuginbasewx.0.0.dylib) so Apple could do without the symlinks as > well. Note though that OSX libraries end in .dylib. Find attached the updated patch that does away with the so-symlinks. cu and- Who can now understand a little bit why cmake is popular, just not having to rerun auto* is an enormous timesaver when testing -reas -- `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' -- You received this message because you are subscribed to the Google Groups "Hugin and other free panoramic software" group. A list of frequently asked questions is available at: http://wiki.panotools.org/Hugin_FAQ To post to this group, send email to hugin-ptx@googlegroups.com To unsubscribe from this group, send email to hugin-ptx+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/hugin-ptx
--- hugin-2010.2.0+dfsg~rc2.orig/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/CMakeLists.txt @@ -343,6 +343,16 @@ IF (APPLE) ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) +IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin") + SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal + libraries in private subdirectory" ) +ELSE (${HUGIN_SHARED} AND UNIX AND NOT APPLE) + # On OS X files are moved around after make install, do not try to use + # rpath or CMAKE_INSTALL_NAME_DIR + SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal + libraries in private subdirectory" ) +ENDIF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) IF (UNIX) IF (${HUGIN_SHARED}) --- hugin-2010.2.0+dfsg~rc2.orig/src/foreign/ANN/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/src/foreign/ANN/CMakeLists.txt @@ -14,8 +14,10 @@ IF (${HUGIN_SHARED_LIBS}) set_target_properties(huginANN PROPERTIES VERSION ${HUGIN_LIB_VERSION}) IF(WIN32) install(TARGETS huginANN RUNTIME DESTINATION ${BINDIR}) + ELSEIF(${HUGIN_LIBS_PRIVATE_DIR}) + install(TARGETS huginANN LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP) ELSE(WIN32) - install(TARGETS huginANN DESTINATION ${LIBDIR}) + install(TARGETS huginANN LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP) ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginANN STATIC ${ANN_SRC} ${ANN_HEADERS}) --- hugin-2010.2.0+dfsg~rc2.orig/src/foreign/vigra/vigra_impex/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/src/foreign/vigra/vigra_impex/CMakeLists.txt @@ -10,8 +10,10 @@ IF (${HUGIN_SHARED_LIBS}) set_target_properties(huginvigraimpex PROPERTIES VERSION ${HUGIN_LIB_VERSION}) IF(WIN32) install(TARGETS huginvigraimpex RUNTIME DESTINATION ${BINDIR}) + ELSEIF(${HUGIN_LIBS_PRIVATE_DIR}) + install(TARGETS huginvigraimpex LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP) ELSE(WIN32) - install(TARGETS huginvigraimpex DESTINATION ${LIBDIR}) + install(TARGETS huginvigraimpex LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP) ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER}) --- hugin-2010.2.0+dfsg~rc2.orig/src/celeste/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/src/celeste/CMakeLists.txt @@ -58,8 +58,10 @@ IF (${HUGIN_SHARED_LIBS}) set_target_properties(celeste PROPERTIES VERSION ${HUGIN_LIB_VERSION}) IF(WIN32) install(TARGETS celeste RUNTIME DESTINATION ${BINDIR}) + ELSEIF(${HUGIN_LIBS_PRIVATE_DIR}) + install(TARGETS celeste LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP) ELSE(WIN32) - install(TARGETS celeste DESTINATION ${LIBDIR}) + install(TARGETS celeste LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP) ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) # messages are quite obtrusive in windows cmakesetup.exe --- hugin-2010.2.0+dfsg~rc2.orig/src/hugin1/base_wx/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/src/hugin1/base_wx/CMakeLists.txt @@ -13,8 +13,10 @@ IF (${HUGIN_SHARED_LIBS}) set_target_properties(huginbasewx PROPERTIES VERSION ${HUGIN_LIB_VERSION}) IF(WIN32) install(TARGETS huginbasewx RUNTIME DESTINATION ${BINDIR}) + ELSEIF(${HUGIN_LIBS_PRIVATE_DIR}) + install(TARGETS huginbasewx LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP) ELSE(WIN32) - install(TARGETS huginbasewx DESTINATION ${LIBDIR}) + install(TARGETS huginbasewx LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP) ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginbasewx STATIC ${HUGIN_WX_BASE_SRC} ${HUGIN_WX_BASE_HEADER}) --- hugin-2010.2.0+dfsg~rc2.orig/src/hugin_base/CMakeLists.txt +++ hugin-2010.2.0+dfsg~rc2/src/hugin_base/CMakeLists.txt @@ -133,8 +133,10 @@ IF (${HUGIN_SHARED_LIBS}) set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION}) IF(WIN32) install(TARGETS huginbase RUNTIME DESTINATION ${BINDIR}) + ELSEIF(${HUGIN_LIBS_PRIVATE_DIR}) + install(TARGETS huginbase LIBRARY DESTINATION ${LIBDIR}/hugin NAMELINK_SKIP) ELSE(WIN32) - install(TARGETS huginbase DESTINATION ${LIBDIR}) + install(TARGETS huginbase LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP) ENDIF(WIN32) ELSE (${HUGIN_SHARED_LIBS}) add_library(huginbase STATIC ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER})