diff options
author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-09-25 09:47:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-25 09:47:12 -0700 |
commit | 4f384b6fadd999324d83b4c4ea900de2a0e13dd7 (patch) | |
tree | d62683a66ede8c7a0ee04e8b67ee999aa71342ea /src | |
parent | f892370a615ecadc011b49a98d2c4695fafa7f4f (diff) |
Use separate CMake project for CVC4 examples. (#3196)
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/bindings/java/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/main/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/parser/CMakeLists.txt | 2 |
4 files changed, 31 insertions, 19 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d062e99c0..7289f650b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -761,8 +761,8 @@ target_include_directories(cvc4 install(TARGETS cvc4 EXPORT cvc4-targets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}) set_target_properties(cvc4 PROPERTIES SOVERSION ${CVC4_SOVERSION}) target_compile_definitions(cvc4 @@ -842,27 +842,27 @@ install(FILES api/cvc4cpp.h api/cvc4cppkind.h DESTINATION - include/cvc4/api) + ${INCLUDE_INSTALL_DIR}/cvc4/api) install(FILES base/configuration.h base/exception.h base/listener.h base/modal_exception.h DESTINATION - include/cvc4/base) + ${INCLUDE_INSTALL_DIR}/cvc4/base) install(FILES context/cdhashmap_forward.h context/cdhashset_forward.h context/cdinsert_hashmap_forward.h context/cdlist_forward.h DESTINATION - include/cvc4/context) + ${INCLUDE_INSTALL_DIR}/cvc4/context) install(FILES include/cvc4.h include/cvc4_public.h include/cvc4parser_public.h DESTINATION - include/cvc4) + ${INCLUDE_INSTALL_DIR}/cvc4) install(FILES expr/array.h expr/array_store_all.h @@ -881,7 +881,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expr/kind.h ${CMAKE_CURRENT_BINARY_DIR}/expr/expr_manager.h DESTINATION - include/cvc4/expr) + ${INCLUDE_INSTALL_DIR}/cvc4/expr) install(FILES options/argument_extender.h options/arith_heuristic_pivot_rule.h @@ -898,38 +898,38 @@ install(FILES options/sygus_out_mode.h options/theoryof_mode.h DESTINATION - include/cvc4/options) + ${INCLUDE_INSTALL_DIR}/cvc4/options) install(FILES parser/input.h parser/parser.h parser/parser_builder.h parser/parser_exception.h DESTINATION - include/cvc4/parser) + ${INCLUDE_INSTALL_DIR}/cvc4/parser) install(FILES printer/sygus_print_callback.h DESTINATION - include/cvc4/printer) + ${INCLUDE_INSTALL_DIR}/cvc4/printer) install(FILES proof/unsat_core.h DESTINATION - include/cvc4/proof) + ${INCLUDE_INSTALL_DIR}/cvc4/proof) install(FILES smt/command.h smt/logic_exception.h smt/smt_engine.h DESTINATION - include/cvc4/smt) + ${INCLUDE_INSTALL_DIR}/cvc4/smt) install(FILES smt_util/lemma_channels.h smt_util/lemma_input_channel.h smt_util/lemma_output_channel.h DESTINATION - include/cvc4/smt_util) + ${INCLUDE_INSTALL_DIR}/cvc4/smt_util) install(FILES theory/logic_info.h DESTINATION - include/cvc4/theory) + ${INCLUDE_INSTALL_DIR}/cvc4/theory) install(FILES util/abstract_value.h util/bitvector.h @@ -955,7 +955,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/util/integer.h ${CMAKE_CURRENT_BINARY_DIR}/util/rational.h DESTINATION - include/cvc4/util) + ${INCLUDE_INSTALL_DIR}/cvc4/util) # Fix include paths for all public headers. # Note: This is a temporary fix until the new C++ API is in place. diff --git a/src/bindings/java/CMakeLists.txt b/src/bindings/java/CMakeLists.txt index 3d1e0463b..b68a353ad 100644 --- a/src/bindings/java/CMakeLists.txt +++ b/src/bindings/java/CMakeLists.txt @@ -276,4 +276,13 @@ add_jar(cvc4jar add_dependencies(cvc4jar cvc4jni) install_jar(cvc4jar DESTINATION share/java/cvc4) install_jni_symlink(cvc4jar DESTINATION share/java/cvc4) -install(TARGETS cvc4jni DESTINATION lib) +install(TARGETS cvc4jni + EXPORT cvc4-targets + DESTINATION ${LIBRARY_INSTALL_DIR}) + +install_jar_exports( + TARGETS cvc4jar + NAMESPACE CVC4:: + FILE CVC4JavaTargets.cmake + DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/CVC4 +) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 356b0e199..96e0078ed 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -47,9 +47,12 @@ set_target_properties(cvc4-bin target_link_libraries(cvc4-bin cvc4 cvc4parser) if(PROGRAM_PREFIX) install(PROGRAMS - $<TARGET_FILE:cvc4-bin> DESTINATION bin RENAME ${PROGRAM_PREFIX}cvc4) + $<TARGET_FILE:cvc4-bin> + DESTINATION ${RUNTIME_INSTALL_DIR} + RENAME ${PROGRAM_PREFIX}cvc4) else() - install(TARGETS cvc4-bin DESTINATION bin) + install(TARGETS cvc4-bin + DESTINATION ${RUNTIME_INSTALL_DIR}) endif() # In order to get a fully static executable we have to make sure that we also diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt index 78ab82cb4..f2c1a6ef4 100644 --- a/src/parser/CMakeLists.txt +++ b/src/parser/CMakeLists.txt @@ -98,7 +98,7 @@ target_link_libraries(cvc4parser cvc4 ${ANTLR_LIBRARIES}) target_include_directories(cvc4parser PRIVATE ${ANTLR_INCLUDE_DIR}) install(TARGETS cvc4parser EXPORT cvc4-targets - DESTINATION lib) + DESTINATION ${LIBRARY_INSTALL_DIR}) # The generated lexer/parser files define some functions as # __declspec(dllexport) via the ANTLR3_API macro, which leads to lots of |