Skip to content

Build: Define default options only on "default"#138

Merged
jonjoliver merged 1 commit intotrendmicro:masterfrom
a4lg:make-other-buckets-work
Oct 8, 2024
Merged

Build: Define default options only on "default"#138
jonjoliver merged 1 commit intotrendmicro:masterfrom
a4lg:make-other-buckets-work

Conversation

@a4lg
Copy link
Copy Markdown
Contributor

@a4lg a4lg commented Mar 9, 2024

This commit sets default options only when no related options are specified.
With this, full hash (256 bucket variant) will compile just by -DTLSH_BUCKETS_256=1.

Just fixing CMakeLists.txt caused an error due to a failure to track with other changes on the version 4.0.0 on min hash (48 buckets variant) so this commit also fixes this issue.

(i.e. when no related options are specified).  With this, full hash (256
bucket variant) will compile just by -DTLSH_BUCKETS_256=1.

It causes an error due to a failure to track with other changes on the
version 4.0.0 on min hash (48 buckets variant) so this commit also fixes
this issue.
@jonjoliver
Copy link
Copy Markdown
Collaborator

jonjoliver commented Sep 18, 2024

Hi @a4lg

ignore my previous comment - that I just edited.
@merces has straightened out the way that outside collaborators can maintain TLSH! :-)

Cheers jono

@jonjoliver jonjoliver mentioned this pull request Sep 19, 2024
@merces merces added this to the 4.12.1 milestone Sep 19, 2024
@jonjoliver jonjoliver merged commit 689a4cc into trendmicro:master Oct 8, 2024
jonjoliver pushed a commit to jonjoliver/tlsh that referenced this pull request Oct 8, 2024
<PRE>
08/10/2024
        Merge pull request trendmicro#146 - Remove call to sprintf() to avoid warnings
        Merge pull request trendmicro#141 - py_ext: use PyVarObject_HEAD instead of PyObject_HEAD_INIT
        Merge pull request trendmicro#138 - Build: Define default options only on "default"
        Merge pull request trendmicro#136 - Bug Fix+Portability: Improve portability by integral division
</PRE>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants