Fix compilation on Linux

roboptim · May 27, 2016 · 998b7a7 · 998b7a7
1 parent 8c84cdc
commit 998b7a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -208,7 +208,11 @@ PKG_CONFIG_APPEND_LIBS(roboptim-core)
 SET(BOOST_COMPONENTS date_time filesystem system unit_test_framework)
 SEARCH_FOR_BOOST()
 SEARCH_FOR_EIGEN("eigen3 >= 3.2.0")
-ADD_REQUIRED_DEPENDENCY("liblog4cxx >= 0.10.0" "liblog4cxx_d >= 0.10.0")
+IF(WIN32)
+  ADD_REQUIRED_DEPENDENCY("liblog4cxx >= 0.10.0" "liblog4cxx_d >= 0.10.0")
+ELSE()
+  ADD_REQUIRED_DEPENDENCY("liblog4cxx >= 0.10.0")
+ENDIF()
 
 # Libtool dynamic loading
 # This project does not use Libtool directly but still uses ltdl for

diff --git a/include/roboptim/core/numeric-linear-function.hh b/include/roboptim/core/numeric-linear-function.hh
@@ -35,7 +35,7 @@ namespace roboptim
   /// \f[f(x) = A x + b\f]
   /// where \f$A\f$ and \f$b\f$ are set when the class is instantiated.
   template <typename T>
-  class GenericNumericLinearFunction
+  class ROBOPTIM_GCC_ETI_WORKAROUND GenericNumericLinearFunction
   : public GenericLinearFunction<T>
   {
   public:

diff --git a/include/roboptim/core/numeric-quadratic-function.hh b/include/roboptim/core/numeric-quadratic-function.hh
@@ -37,7 +37,7 @@ namespace roboptim
   ///
   /// \note A is a symmetric matrix.
   template <typename T>
-  class GenericNumericQuadraticFunction
+  class ROBOPTIM_GCC_ETI_WORKAROUND GenericNumericQuadraticFunction
   : public GenericQuadraticFunction<T>
   {
   public: