I'm sorry.
The linux version is the master branch.
Mac works on the origin/mac branch.
So I should actually create 2 patches.
I simply acted too quickly and combined the two.
So actually the first patch should go on the mac branch, and I should make
a second patch for the master branch.
Or better: Change the makefile in the master branch so that it checks
whether it runs on Apple, gnu linux or win32/win64, and then remove the mac
branch.
And in the CMakeLists.txt file we should have at line 38 something like
# prevent in-tree building
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
message(FATAL_ERROR "In-source builds are not allowed.")
endif()
Best,
Harry
Harry
Op za 13 mrt. 2021 om 15:30 schreef Kornel Benko <[email protected]>:
> Am Sat, 13 Mar 2021 15:11:23 +0100
> schrieb Harry van der Wolf <[email protected]>:
>
> > Sorry,
> >
> > I made the patch on my Mac and forgot about the changes for Linux 18.04
> >
> > See attached patch 2 including the changes of the previous patch as well.
> > Do not apply the previous "mac_exiv2_bundle.patch", but only this
> > "mac_exiv2_bundle_2.patch"
> >
>
> We have to wait for Kay anyway. He is ATM the only on I know of who can
> commit.
>
> Applying the patch locally I got errors.
>
> patching file CMakeLists.txt
> patching file CMakeModules/FindEXIV2.cmake
> can't find file to patch at input line 163
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git a/scripts/make_bundle.sh b/scripts/make_bundle.sh
> |index 16f73d8..40cd80c 100755
> |--- a/scripts/make_bundle.sh
> |+++ b/scripts/make_bundle.sh
> --------------------------
> File to patch:
>
> .................................
> Here, the scripts directory does (of course) not exist.
>
> Apart from that, pv is still compilable. Thanks for the patch.
> (Ask Kay to include your scripts dir)
>
> Kornel
>
> --
> 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 [email protected].
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/hugin-ptx/20210313153053.14e1dfd3%40admin1-desktop
> .
>
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/CAGARPpuxSy1Pki438P%2ByyNMgz4o%3Dyx%3D5fqo3F8y4pPP0KMQNuw%40mail.gmail.com.
