[mlpack-git] master: Don't set MLPACK_USE_64BIT_WORD when on a 32-bit system. (5be6093)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/7a8b0e1292677b71888fad313772c63bcf0e7b80...de88672879a1893ebfc131538c64e7755251337c

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

commit 5be6093c2e74ed0c27ccde3179ecec438ca94ed4
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Oct 2 21:08:53 2015 +0000

    Don't set MLPACK_USE_64BIT_WORD when on a 32-bit system.


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

5be6093c2e74ed0c27ccde3179ecec438ca94ed4
 CMake/CreateArmaConfigInfo.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMake/CreateArmaConfigInfo.cmake b/CMake/CreateArmaConfigInfo.cmake
index 606c051..02b77eb 100644
--- a/CMake/CreateArmaConfigInfo.cmake
+++ b/CMake/CreateArmaConfigInfo.cmake
@@ -13,7 +13,12 @@ endif(EXISTS "${CMAKE_SOURCE_DIR}/src/mlpack/core/util/arma_config.hpp")
 # If we are using Armadillo 5+, ARMA_64BIT_WORD is implicitly enabled.
 set(ARMA_HAS_64BIT_WORD 0) # This may be unnecessary.
 if(NOT (${ARMADILLO_VERSION_MAJOR} LESS 5))
-  set(ARMA_HAS_64BIT_WORD 1)
+  # ARMA_64BIT_WORD is only set if we are on a 64-bit system.
+  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(ARMA_HAS_64BIT_WORD 1)
+  else (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(ARMA_HAS_64BIT_WORD 0)
+  endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
 else(NOT (${ARMADILLO_VERSION_MAJOR} LESS 5))
   # Otherwise, we'll need to open the config.hpp we are using and inspect the
   # setting of ARMA_64BIT_WORD.