From: Mathias Preiner <mathias.preiner@gmail.com>
Date: Fri, 17 Aug 2018 00:57:55 +0000 (-0700)
Subject: cmake: Fix some includes.
X-Git-Tag: cvc5-1.0.0~4601
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=385b9961186691c0618754bc9b0f49458c20445d;p=cvc5.git

cmake: Fix some includes.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5328843f..2d8d20962 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -573,10 +573,8 @@ target_link_libraries(cvc4
   ${CVC4_LIBRARIES}
 )
 
+include_directories(include)
 include_directories(. ${CMAKE_CURRENT_BINARY_DIR})
-include_directories(expr ${CMAKE_CURRENT_BINARY_DIR}/expr)
-include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include)
-include_directories(options ${CMAKE_CURRENT_BINARY_DIR}/options)
 
 add_subdirectory(base)
 #add_subdirectory(bindings)
diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
index bc8861ea8..ce4b354f3 100644
--- a/src/parser/CMakeLists.txt
+++ b/src/parser/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(cvc4parser parsercvc parsersmt1 parsersmt2 parsertptp cvc4
 target_link_libraries(cvc4parser ${ANTLR_LIBRARIES})
 
 # ANTLR includes required for all subdirectories
-include_directories(cvc4parser PRIVATE ${ANTLR_INCLUDE_DIR})
+include_directories(${ANTLR_INCLUDE_DIR})
 add_subdirectory(cvc)
 add_subdirectory(smt1)
 add_subdirectory(smt2)