[capd] modified imports

codac-team · Jan 10, 2025 · 522ac27 · 522ac27
1 parent ece0e61
commit 522ac27
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/examples/05_capd_solver/main.cpp b/examples/05_capd_solver/main.cpp
@@ -3,7 +3,7 @@
 
 #include <codac>
 #include <codac-capd.h>
-#include "capd/capdlib.h"
+#include <capd/capdlib.h>
 
 using namespace std;
 using namespace codac2;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -107,6 +107,7 @@
 
     find_library(CODAC_CAPD_LIBRARY NAMES ${PROJECT_NAME}-capd
                  PATH_SUFFIXES lib)
+                 
     set(CODAC_LIBRARIES \${CODAC_LIBRARIES} \${CODAC_CAPD_LIBRARY} capd::capd)
     ")
 

diff --git a/src/capd/CMakeLists.txt b/src/capd/CMakeLists.txt
@@ -45,7 +45,6 @@ list(APPEND CODAC_CAPD_SRC
   # Generating the file codac-capd.h
 
   set(CODAC_CAPD_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-capd.h)
-  set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "codac-capd.h" PARENT_SCOPE)
   file(WRITE ${CODAC_CAPD_MAIN_HEADER} "/* This file is generated by CMake */\n\n")
   file(APPEND ${CODAC_CAPD_MAIN_HEADER} "#pragma once\n\n")
   foreach(header_path ${CODAC_CAPD_HDR})

diff --git a/src/capd/codac2_capd.cpp b/src/capd/codac2_capd.cpp
@@ -12,8 +12,6 @@
 
 using namespace std;
 
-#include <iostream>
-
 namespace codac2
 {
   capd::Interval to_capd(const Interval &x)

diff --git a/src/capd/codac2_capd.h b/src/capd/codac2_capd.h
@@ -9,7 +9,9 @@
 
 #pragma once
 
-#include "capd/capdlib.h"
+// #include "capd/capdlib.h"
+#include <capd/intervals/lib.h>
+#include <capd/vectalg/lib.h>
 #include "codac2_IntervalVector.h"
 #include "codac2_Matrix.h"
 #include "codac2_IntervalMatrix.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ @@
         find_library(CODAC_CAPD_LIBRARY NAMES ${PROJECT_NAME}-capd
                      PATH_SUFFIXES lib)
         set(CODAC_LIBRARIES \${CODAC_LIBRARIES} \${CODAC_CAPD_LIBRARY} capd::capd)
         ")
@@ Expand Down @@