From 2b6c309cb92d89cf9b5b0824dc8ad8cdbef96a8d Mon Sep 17 00:00:00 2001 From: Leonardo Florez-Valencia Date: Sun, 13 Sep 2015 15:07:39 +0200 Subject: [PATCH] ... --- cmake/cpPluginsConfig.cmake.in | 18 +++++++++++++----- .../Algorithms/KalmanConstantFilter.h | 2 +- .../Extensions/Algorithms/KalmanFilter.h | 4 +++- .../Algorithms/KalmanVelocityFilter.h | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in index adbf4d4..e8efd6d 100644 --- a/cmake/cpPluginsConfig.cmake.in +++ b/cmake/cpPluginsConfig.cmake.in @@ -24,11 +24,19 @@ INCLUDE_DIRECTORIES( # -- Library directories -- # ========================= -LINK_DIRECTORIES( - @PROJECT_BINARY_DIR@ - @CMAKE_INSTALL_PREFIX@/bin - @CMAKE_INSTALL_PREFIX@/lib - ) +IF(MSVC) + LINK_DIRECTORIES( + @PROJECT_BINARY_DIR@/$(ConfigurationName) + @CMAKE_INSTALL_PREFIX@/bin + @CMAKE_INSTALL_PREFIX@/lib + ) +ELSE(MSVC) + LINK_DIRECTORIES( + @PROJECT_BINARY_DIR@ + @CMAKE_INSTALL_PREFIX@/bin + @CMAKE_INSTALL_PREFIX@/lib + ) +ENDIF(MSVC) # =================== # -- Library names -- diff --git a/lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h b/lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h index b8c61bc..74d8ddf 100644 --- a/lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h +++ b/lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h @@ -16,7 +16,7 @@ namespace cpPlugins /** */ template< typename T > - class KalmanConstantFilter + class cpPlugins_Extensions_EXPORT KalmanConstantFilter : public KalmanFilter< T > { public: diff --git a/lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h b/lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h index 74b0f3a..849ac34 100644 --- a/lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h +++ b/lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h @@ -5,6 +5,8 @@ #ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__H__ #define __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__H__ +#include + #include #include #include @@ -57,7 +59,7 @@ namespace cpPlugins * for a description of this algorithm. */ template< typename T > - class KalmanFilter + class cpPlugins_Extensions_EXPORT KalmanFilter : public itk::Object { public: diff --git a/lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h b/lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h index 0454ec3..ba34d4d 100644 --- a/lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h +++ b/lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h @@ -16,7 +16,7 @@ namespace cpPlugins /** */ template< typename T > - class KalmanVelocityFilter + class cpPlugins_Extensions_EXPORT KalmanVelocityFilter : public KalmanFilter< T > { public: -- 2.47.1