From 522ac2765f8fb096c7d185cec6296ac363f47800 Mon Sep 17 00:00:00 2001 From: godardma Date: Fri, 10 Jan 2025 15:30:37 +0100 Subject: [PATCH] [capd] modified imports --- examples/05_capd_solver/main.cpp | 2 +- src/CMakeLists.txt | 1 + src/capd/CMakeLists.txt | 1 - src/capd/codac2_capd.cpp | 2 -- src/capd/codac2_capd.h | 4 +++- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/05_capd_solver/main.cpp b/examples/05_capd_solver/main.cpp index 9428bdb5..bd537bb4 100644 --- a/examples/05_capd_solver/main.cpp +++ b/examples/05_capd_solver/main.cpp @@ -3,7 +3,7 @@ #include #include -#include "capd/capdlib.h" +#include using namespace std; using namespace codac2; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aece5fd9..99109ee6 100644 --- 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 index 8a4fe56d..eb20b24b 100644 --- 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 index f5398f6a..e847102a 100644 --- a/src/capd/codac2_capd.cpp +++ b/src/capd/codac2_capd.cpp @@ -12,8 +12,6 @@ using namespace std; -#include - namespace codac2 { capd::Interval to_capd(const Interval &x) diff --git a/src/capd/codac2_capd.h b/src/capd/codac2_capd.h index 659bfff9..9c442fcd 100644 --- 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 +#include #include "codac2_IntervalVector.h" #include "codac2_Matrix.h" #include "codac2_IntervalMatrix.h"