[mlpack-git] master: Move mlpack_export.h to mlpack_export.hpp. (d502539)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/93eb34cc4daf08cc331d1a22fccf44950b276daa...d502539e6180124a4e0ffdaf27c9cc3295a7849b

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

commit d502539e6180124a4e0ffdaf27c9cc3295a7849b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon May 9 10:58:16 2016 -0700

    Move mlpack_export.h to mlpack_export.hpp.


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

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

diff --git a/src/mlpack/CMakeLists.txt b/src/mlpack/CMakeLists.txt
index 2b3338a..0a044a3 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/mlpack_export.h
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) # mlpack/mlpack_export.hpp
 
 # Add core.hpp to list of sources.
 set(MLPACK_SRCS ${MLPACK_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/core.hpp")
@@ -27,7 +27,7 @@ add_library(mlpack ${MLPACK_SRCS})
 # necessary for global variables (of which there are a few in mlpack).
 set_target_properties(mlpack PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 include(GenerateExportHeader)
-generate_export_header(mlpack)
+generate_export_header(mlpack EXPORT_FILE_NAME mlpack_export.hpp)
 if (NOT BUILD_SHARED_LIBS)
   add_definitions(-DMLPACK_STATIC_DEFINE)
 endif ()
@@ -70,7 +70,7 @@ add_custom_command(TARGET mlpack_headers POST_BUILD
   COMMAND ${CMAKE_COMMAND} ARGS -E
     make_directory ${CMAKE_BINARY_DIR}/include/mlpack/
   COMMAND ${CMAKE_COMMAND} ARGS -E
-    copy ${CMAKE_CURRENT_BINARY_DIR}/mlpack_export.h
+    copy ${CMAKE_CURRENT_BINARY_DIR}/mlpack_export.hpp
          ${CMAKE_BINARY_DIR}/include/mlpack)
 
 # Then copy each of the header files over to that directory.
diff --git a/src/mlpack/core/math/random.cpp b/src/mlpack/core/math/random.cpp
index cb4e6fa..d83a9bf 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/mlpack_export.h>
+#include <mlpack/mlpack_export.hpp>
 
 namespace mlpack {
 namespace math {
diff --git a/src/mlpack/core/math/random.hpp b/src/mlpack/core/math/random.hpp
index 7ba0d9c..a61be19 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/mlpack_export.h>
+#include <mlpack/mlpack_export.hpp>
 #include <random>
 
 namespace mlpack {
diff --git a/src/mlpack/core/util/log.hpp b/src/mlpack/core/util/log.hpp
index 6310d96..4602479 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/mlpack_export.h>
+#include <mlpack/mlpack_export.hpp>
 
 #include "prefixedoutstream.hpp"
 #include "nulloutstream.hpp"