From eb51f59af4956c80e7683ee0453d14eb8431ce58 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Mon, 6 Apr 2020 14:24:07 +0300 Subject: [PATCH] avoid cmake warnings --- scripts/Tatzer | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/Tatzer b/scripts/Tatzer index 2483dec..b560470 100755 --- a/scripts/Tatzer +++ b/scripts/Tatzer @@ -15,7 +15,7 @@ use Path::Tiny qw/path/; my %BOOL_OPTS_WITH_FALSE_DEFAULTS = ( 'omit-frame' => 'OPTIMIZATION_OMIT_FRAME_POINTER', ); -my %TRUE_BOOL_OPTS = ( 'test-suite' => 'FCS_WITH_TEST_SUITE', ); +my %TRUE_BOOL_OPTS = ( 'test-suite' => 'WITH_TEST_SUITE', ); my %INT_OPTS = ( 'pack-size' => 'FCS_IA_PACK_SIZE', ); @@ -26,7 +26,7 @@ my %STR_OPTS = ( map { my ( $key, $param ) = @$_; ( $key => +{ prefix => "${param}_", param => $param } ) - } ( [ 'p|pos' => 'BHS_STATE_STORAGE' ], ) + } ( [], ) ), ); @@ -53,10 +53,8 @@ $STR_OPTS{'prefix'}{value} = '/usr'; my $build_type = "debug"; my $generate_what; -my $build_static_lib = 0; my $with_context_var = 1; my $max_bench_threads_num = 4; -my $link_to_static = 0; sub set_both { @@ -76,7 +74,7 @@ sub set_hash set_hash(); my %themes = ( - tt => [qw(-r --notest-suite --static)], + tt => [qw(-r --notest-suite)], bench => [qw(-l tt --omit-frame)], fc_bench => [qw(-l bench)], testing => [qw(--rwd --test-suite)], @@ -254,10 +252,8 @@ GetOptions( return; }, 'tokyo' => sub { return set_both("TOKYO_CAB_HASH"); }, - 'static' => \$build_static_lib, 'with-ctx-var!' => \$with_context_var, 'max-bench-threads-num=i' => \$max_bench_threads_num, - 'static!' => \$link_to_static, ( map { ; "$_!" => \( $bool_opts_with_false_defaults__values{$_} ) } @BOOL_OPTS_WITH_FALSE_DEFAULTS__KEYS @@ -298,7 +294,6 @@ my @cmd = ( ( defined($generate_what) ? ( "-G", $generate_what ) : () ), "-DCMAKE_BUILD_TYPE=$build_type", "-DDATADIR=$STR_OPTS{prefix}{value}/share", - ( ( !$build_static_lib ) ? ("-DBUILD_STATIC_LIBRARY=") : () ), ( map { $bool_opts_with_false_defaults__values{$_} -- 2.40.0