move clasp app to cli part of library

potassco · May 3, 2022 · 335c762 · 335c762 · Alessandro-Barbieri · May 3, 2022
1 parent 51441a8
commit 335c762
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(files
-	clasp_app.cpp
-	clasp_app.h
 	main.cpp)
 add_executable(clasp ${files})
 set_target_properties(clasp PROPERTIES FOLDER exe)

diff --git a/app/main.cpp b/app/main.cpp
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //
-#include "clasp_app.h"
+#include <clasp/cli/clasp_app.h>
 /////////////////////////////////////////////////////////////////////////////////////////
 // main - entry point
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/app/clasp_app.h → clasp/cli/clasp_app.h b/app/clasp_app.h → clasp/cli/clasp_app.h
@@ -21,8 +21,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //
-#ifndef CLASP_CLASP_APP_H_INCLUDED
-#define CLASP_CLASP_APP_H_INCLUDED
+#ifndef CLASP_CLI_CLASP_APP_H_INCLUDED
+#define CLASP_CLI_CLASP_APP_H_INCLUDED
 
 #ifdef _MSC_VER
 #pragma once

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ set(header_util
 	${header_path}/util/timer.h)
 source_group("${ide_header}\\util" FILES ${header_util})
 set(header_cli
+	${header_path}/cli/clasp_app.h
 	${header_path}/cli/clasp_cli_configs.inl
 	${header_path}/cli/clasp_cli_options.inl
 	${header_path}/cli/clasp_output.h
@@ -84,6 +85,7 @@ source_group("${ide_header}\\cli" FILES ${header_cli})
 set(src
 	asp_preprocessor.cpp
 	cb_enumerator.cpp
+	clasp_app.cpp
 	clasp_facade.cpp
 	clasp_options.cpp
 	clasp_output.cpp

diff --git a/app/clasp_app.cpp → src/clasp_app.cpp b/app/clasp_app.cpp → src/clasp_app.cpp
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //
-#include "clasp_app.h"
+#include <clasp/cli/clasp_app.h>
 #include <clasp/solver.h>
 #include <clasp/dependency_graph.h>
 #include <clasp/parser.h>