From e73aa912b0716f45642865baf245693f94bdea63 Mon Sep 17 00:00:00 2001 From: Gereon Kremer Date: Mon, 13 Sep 2021 18:14:58 +0200 Subject: [PATCH] Add main options to cmake (#7178) This PR adds main/options.cpp to cmake. Also, it removes the old (now obsolete and unused) options script. --- src/CMakeLists.txt | 3 ++- src/options/generate-toml-files.sh | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100755 src/options/generate-toml-files.sh diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ecfef1c22..42434adab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1208,7 +1208,7 @@ set(options_toml_files ) string(REPLACE "toml" "cpp;" options_gen_cpp_files ${options_toml_files}) string(REPLACE "toml" "h;" options_gen_h_files ${options_toml_files}) -list(APPEND options_gen_cpp_files "options/options.cpp" "options/options_public.cpp") +list(APPEND options_gen_cpp_files "options/options.cpp" "options/options_public.cpp" "main/options.cpp") list(APPEND options_gen_h_files "options/options.h") libcvc5_add_sources(GENERATED ${options_gen_cpp_files} ${options_gen_h_files}) @@ -1240,6 +1240,7 @@ add_custom_command( DEPENDS options/mkoptions.py ${options_toml_files} + main/options_template.cpp options/module_template.h options/module_template.cpp options/options_public_template.cpp diff --git a/src/options/generate-toml-files.sh b/src/options/generate-toml-files.sh deleted file mode 100755 index 1a2100227..000000000 --- a/src/options/generate-toml-files.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -for f in *_options; do echo $f; time ./mkoptions-toml module-sed $f > ${f}.toml; done -- 2.30.2