update clasp

potassco · May 4, 2022 · 13f305a · 13f305a
1 parent 9096fc2
commit 13f305a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/clasp b/clasp
diff --git a/libclingo/CMakeLists.txt b/libclingo/CMakeLists.txt
@@ -37,9 +37,6 @@ set(source
     ${source-group})
 # ]]]
 
-list(APPEND header "${CLASP_SOURCE_DIR}/app/clasp_app.h")
-list(APPEND source "${CLASP_SOURCE_DIR}/app/clasp_app.cpp")
-
 set(clingo_public_scope_ PUBLIC)
 set(clingo_private_scope_ PRIVATE)
 if (CLINGO_BUILD_SHARED)
@@ -60,9 +57,7 @@ target_link_libraries(libclingo ${clingo_private_scope_} libgringo libclasp)
 target_include_directories(libclingo
     ${clingo_public_scope_}
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-    ${clingo_private_scope_}
-    "$<BUILD_INTERFACE:${CLASP_SOURCE_DIR}/app>")
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 target_compile_definitions(libclingo ${clingo_private_scope_} CLINGO_BUILD_LIBRARY)
 
 if (NOT CLINGO_BUILD_SHARED)

diff --git a/libclingo/clingo/clingo_app.hh b/libclingo/clingo/clingo_app.hh
@@ -25,7 +25,7 @@
 #ifndef CLINGO_CLINGOAPP_HH
 #define CLINGO_CLINGOAPP_HH
 
-#include "clasp_app.h"
+#include <clasp/cli/clasp_app.h>
 #include "clingo/clingocontrol.hh"
 
 namespace Gringo {
+8 −0		CHANGES
+2 −2		CMakeLists.txt
+0 −2		app/CMakeLists.txt
+1 −1		app/main.cpp
+2 −2		clasp/cli/clasp_app.h
+1 −1		libpotassco
+2 −0		src/CMakeLists.txt
+1 −1		src/clasp_app.cpp