Sorry, @Harry, I accidentally answered to you only, here's to the list:

Am 13.03.21 um 16:06 schrieb Harry van der Wolf:

The linux version is the master branch.
Mac works on the origin/mac branch.

@ Harry, Kornel

Yeah, I figured the mac-only stuff would best be placed in the mac branch, because it means nothing to the other branches, whereas the CMakeLists.txt is multi-platform, so I put it in master.

Kornel proposed to keep the build files updated by doing ordinary
diff -u diffs against single files, which I would find easier than patches against the whole repo or branches of it - so far the number of files affected is quite low. I only touched the CMakeLists.txt yesterday to put in the copyright header and some initial comments and I don't expect to have too much to contribute to it, so we shouldn't run into messy conflicts.

Is that okay with you guys?

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.

So... which is what and what should I put in the repo now??

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()

You might as well simply trust the user. Most people who've come so far as doing their own builds should know that in-tree builds aren't cool. I think it's best to keep it simple, no need to regulate everything. Just my personal opinion...

Kay

--
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/6950e5fc-9772-16b1-0f5f-c1c8e0cedd65%40yahoo.com.

Reply via email to