[mlpack-git] master: Properly handle when the build directory has spaces in its name. (7b1c09a)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/f13e7f33c8d3842cad7f5698eb9cce41c3138c3d...7e25083f4695d09a3d8c965976eec2b7056f16ac

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

commit 7b1c09a2c0b6ab21bdf265a5ff0367e8cecfa67f
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Sep 16 18:28:09 2016 -0400

    Properly handle when the build directory has spaces in its name.


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

7b1c09a2c0b6ab21bdf265a5ff0367e8cecfa67f
 CMake/GeneratePkgConfig.cmake | 7 ++++---
 CMakeLists.txt                | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMake/GeneratePkgConfig.cmake b/CMake/GeneratePkgConfig.cmake
index 7a04040..ef871ef 100644
--- a/CMake/GeneratePkgConfig.cmake
+++ b/CMake/GeneratePkgConfig.cmake
@@ -5,12 +5,13 @@
 # And our goal in this file is to generate/configure mlpack.pc.
 
 # First, we need to extract the version string.
-if (NOT EXISTS "${MLPACK_SOURCE_DIR}/mlpack/core/util/version.hpp")
+if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/mlpack/core/util/version.hpp")
   message(FATAL_ERROR "Cannot open "
-      "${MLPACK_SOURCE_DIR}/mlpack/core/util/version.hpp to extract version!")
+      "${CNAKE_BINARY_DIR}/include/mlpack/core/util/version.hpp to extract "
+      "version!")
 endif ()
 
-file(READ "${MLPACK_SOURCE_DIR}/mlpack/core/util/version.hpp"
+file(READ "${CMAKE_BINARY_DIR}/include/mlpack/core/util/version.hpp"
     VERSION_HPP_CONTENTS)
 string(REGEX REPLACE ".*#define MLPACK_VERSION_MAJOR ([0-9]+).*" "\\1"
     MLPACK_VERSION_MAJOR "${VERSION_HPP_CONTENTS}")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c80c4a..dda9ab2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -534,10 +534,10 @@ if (PKG_CONFIG_FOUND)
 
   add_custom_target(pkgconfig ALL
       ${CMAKE_COMMAND}
-          -D MLPACK_SOURCE_DIR="${CMAKE_BINARY_DIR}/include/"
           -P "${CMAKE_CURRENT_SOURCE_DIR}/CMake/GeneratePkgConfig.cmake"
       DEPENDS mlpack_headers
-      COMMENT "Generating mlpack.pc (pkg-config) file.")
+      COMMENT "Generating mlpack.pc (pkg-config) file."
+      VERBATIM)
 
   # Do we need a different directory?
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/mlpack.pc