cmake: Fix some includes.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5328843f2e9e0b7045e87ca3b11a494354fee07..2d8d209626b6369a1a191e15c81710f2e09270e9 100644 (file)
--- 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 bc8861ea8f5bf9e9d59c28fd3292e6f1f11230d7..ce4b354f31801a0615a0b92c3f335433d051233e 100644 (file)
--- 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)