From 3d9e5c3feea93a92f14001cff825018c93d35109 Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Fri, 27 Oct 2017 14:46:08 +0200
Subject: [PATCH] [CMake] Organize solvers submodule
---
CMakeLists.txt | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7928038..c66588e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,16 @@ INCLUDE_DIRECTORIES(${NUMPY_INCLUDE_DIRS})
# ----------------------------------------------------
# --- INCLUDE ----------------------------------------
# ----------------------------------------------------
+SET(${PROJECT_NAME}_SOLVERS_HEADERS
+ solvers/solvers.hpp
+ solvers/IterativeSolverBase.hpp
+ solvers/LeastSquaresConjugateGradient.hpp
+ solvers/ConjugateGradient.hpp
+ solvers/SparseSolverBase.hpp
+ )
+
SET(HEADERS
+ ${${PROJECT_NAME}_SOLVERS_HEADERS}
eigenpy.hpp
exception.hpp
details.hpp
@@ -91,11 +100,6 @@ SET(HEADERS
registration.hpp
angle-axis.hpp
quaternion.hpp
- solvers/solvers.hpp
- solvers/IterativeSolverBase.hpp
- solvers/LeastSquaresConjugateGradient.hpp
- solvers/ConjugateGradient.hpp
- solvers/SparseSolverBase.hpp
)
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy")
@@ -134,12 +138,15 @@ ENDFOREACH(header)
# ----------------------------------------------------
# --- TARGETS ----------------------------------------
# ----------------------------------------------------
+SET(${PROJECT_NAME}_SOLVERS_SOURCES
+ src/solvers/solvers.cpp
+ )
SET(${PROJECT_NAME}_SOURCES
+ ${${PROJECT_NAME}_SOLVERS_SOURCES}
src/exception.cpp
src/eigenpy.cpp
src/angle-axis.cpp
src/quaternion.cpp
- src/solvers/solvers.cpp
)
ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
--
GitLab