summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorMathias Preiner <mathias.preiner@gmail.com>2018-09-12 00:08:19 -0700
committerMathias Preiner <mathias.preiner@gmail.com>2018-09-22 16:30:59 -0700
commit507748d8bbdd2c9a2d29f83fd7f4ee6ac8d3fe08 (patch)
tree5bebc96652aa40aa970c51f796e89f8f619192bd /src/base
parent52281cf25960740c46275783cf62c881fa8ef703 (diff)
cmake: Only build libcvc4 and libcvc4parser as libraries.
The sources of all previous libraries are now added to libcvc4 and built as libcvc4. This removes circular dependencies between libcvc4 and libexpr. Further, we now only have one parser library and don't build additional libraries for each language.
Diffstat (limited to 'src/base')
-rw-r--r--src/base/CMakeLists.txt10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index d54564ca6..320049c8c 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -1,6 +1,6 @@
configure_file(git_versioninfo.cpp.in git_versioninfo.cpp)
-set(base_src_files
+libcvc4_add_sources(
configuration.cpp
configuration.h
configuration_private.h
@@ -17,10 +17,7 @@ set(base_src_files
output.h
)
-add_library(base
- ${base_src_files} ${CMAKE_CURRENT_BINARY_DIR}/git_versioninfo.cpp)
-target_compile_definitions(base PRIVATE -D__BUILDING_CVC4LIB)
-add_dependencies(base tags_headers)
+libcvc4_add_sources(GENERATED git_versioninfo.cpp)
#
# Generate code for debug/trace tags
@@ -74,8 +71,7 @@ add_custom_command(
DEPENDS mktagheaders ${CMAKE_CURRENT_BINARY_DIR}/Trace_tags
)
-add_custom_target(
- tags_headers
+add_custom_target(gen-tags
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/Debug_tags.h
${CMAKE_CURRENT_BINARY_DIR}/Trace_tags.h
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback