[mlpack-git] master: Fix mlpack_export.h include (d47933c)

gitdub at mlpack.org gitdub at mlpack.org
Mon May 2 14:57:12 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/7264d37128a9f97ee1f0d481f37cc2bf1d3b1f30...4c8a8d1ccbc33916794fe0f6142fa5378ff8503d

>---------------------------------------------------------------

commit d47933c6169b8067d2ea3f21ae0d37eb9a3a739e
Author: Michel Zou <xantares09 at hotmail.com>
Date:   Mon May 2 20:57:12 2016 +0200

    Fix mlpack_export.h include


>---------------------------------------------------------------

d47933c6169b8067d2ea3f21ae0d37eb9a3a739e
 src/mlpack/CMakeLists.txt       | 2 +-
 src/mlpack/core/math/random.cpp | 2 +-
 src/mlpack/core/math/random.hpp | 2 +-
 src/mlpack/core/util/log.hpp    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/CMakeLists.txt b/src/mlpack/CMakeLists.txt
index 51bea6c..2b3338a 100644
--- a/src/mlpack/CMakeLists.txt
+++ b/src/mlpack/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(..) # <mlpack/[whatever]>
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # mlpack_export.h
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) # mlpack/mlpack_export.h
 
 # Add core.hpp to list of sources.
 set(MLPACK_SRCS ${MLPACK_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/core.hpp")
diff --git a/src/mlpack/core/math/random.cpp b/src/mlpack/core/math/random.cpp
index cb56baf..cb4e6fa 100644
--- a/src/mlpack/core/math/random.cpp
+++ b/src/mlpack/core/math/random.cpp
@@ -4,7 +4,7 @@
  * Declarations of global random number generators.
  */
 #include <random>
-#include <mlpack_export.h>
+#include <mlpack/mlpack_export.h>
 
 namespace mlpack {
 namespace math {
diff --git a/src/mlpack/core/math/random.hpp b/src/mlpack/core/math/random.hpp
index c613069..7ba0d9c 100644
--- a/src/mlpack/core/math/random.hpp
+++ b/src/mlpack/core/math/random.hpp
@@ -7,7 +7,7 @@
 #define MLPACK_CORE_MATH_RANDOM_HPP
 
 #include <mlpack/prereqs.hpp>
-#include <mlpack_export.h>
+#include <mlpack/mlpack_export.h>
 #include <random>
 
 namespace mlpack {
diff --git a/src/mlpack/core/util/log.hpp b/src/mlpack/core/util/log.hpp
index c0c56ab..6310d96 100644
--- a/src/mlpack/core/util/log.hpp
+++ b/src/mlpack/core/util/log.hpp
@@ -8,7 +8,7 @@
 #define MLPACK_CORE_UTIL_LOG_HPP
 
 #include <string>
-#include <mlpack_export.h>
+#include <mlpack/mlpack_export.h>
 
 #include "prefixedoutstream.hpp"
 #include "nulloutstream.hpp"




More information about the mlpack-git mailing list