[mlpack-svn] r13370 - in mlpack/trunk: . CMake

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-08-08 12:51:56 -0400 (Wed, 08 Aug 2012)
New Revision: 13370

Removed:
   mlpack/trunk/CMake/FindArmadillo.cmake
Modified:
   mlpack/trunk/CMakeLists.txt
Log:
FindArmadillo.cmake ships with CMake from version 2.8.5-rc1 onwards.  So require
that.


Deleted: mlpack/trunk/CMake/FindArmadillo.cmake
===================================================================
--- mlpack/trunk/CMake/FindArmadillo.cmake	2012-08-08 16:44:34 UTC (rev 13369)
+++ mlpack/trunk/CMake/FindArmadillo.cmake	2012-08-08 16:51:56 UTC (rev 13370)
@@ -1,109 +0,0 @@
-# - Find Armadillo
-# Find the Armadillo C++ library
-#
-# Using Armadillo:
-#  find_package(Armadillo REQUIRED)
-#  include_directories(${ARMADILLO_INCLUDE_DIRS})
-#  add_executable(foo foo.cc)
-#  target_link_libraries(foo ${ARMADILLO_LIBRARIES})
-# This module sets the following variables:
-#  ARMADILLO_FOUND - set to true if the library is found
-#  ARMADILLO_INCLUDE_DIRS - list of required include directories
-#  ARMADILLO_LIBRARIES - list of libraries to be linked
-#  ARMADILLO_VERSION_MAJOR - major version number
-#  ARMADILLO_VERSION_MINOR - minor version number
-#  ARMADILLO_VERSION_PATCH - patch version number
-#  ARMADILLO_VERSION_STRING - version number as a string (ex: "1.0.4")
-#  ARMADILLO_VERSION_NAME - name of the version (ex: "Antipodean Antileech")
-
-#=============================================================================
-# Copyright 2011 Clement Creusot <creusot at cs.york.ac.uk>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-# UNIX paths are standard, no need to write.
-find_library(ARMADILLO_LIBRARY
-  NAMES armadillo
-  PATHS "$ENV{ProgramFiles}/Armadillo/lib"  "$ENV{ProgramFiles}/Armadillo/lib64" "$ENV{ProgramFiles}/Armadillo"
-  )
-find_path(ARMADILLO_INCLUDE_DIR
-  NAMES armadillo
-  PATHS "$ENV{ProgramFiles}/Armadillo/include"
-  )
-
-
-if(ARMADILLO_INCLUDE_DIR)
-
-  # ------------------------------------------------------------------------
-  #  Extract version information from <armadillo>
-  # ------------------------------------------------------------------------
-
-  # WARNING: Early releases of Armadillo didn't have the arma_version.hpp file.
-  # (e.g. v.0.9.8-1 in ubuntu maverick packages (2001-03-15))
-  # If the file is missing, set all values to 0
-  set(ARMADILLO_VERSION_MAJOR 0)
-  set(ARMADILLO_VERSION_MINOR 0)
-  set(ARMADILLO_VERSION_PATCH 0)
-  set(ARMADILLO_VERSION_NAME "EARLY RELEASE")
-
-  if(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/arma_version.hpp")
-
-    # Read and parse armdillo version header file for version number
-    file(READ "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/arma_version.hpp" _armadillo_HEADER_CONTENTS)
-    string(REGEX REPLACE ".*#define ARMA_VERSION_MAJOR ([0-9]+).*" "\\1" ARMADILLO_VERSION_MAJOR "${_armadillo_HEADER_CONTENTS}")
-    string(REGEX REPLACE ".*#define ARMA_VERSION_MINOR ([0-9]+).*" "\\1" ARMADILLO_VERSION_MINOR "${_armadillo_HEADER_CONTENTS}")
-    string(REGEX REPLACE ".*#define ARMA_VERSION_PATCH ([0-9]+).*" "\\1" ARMADILLO_VERSION_PATCH "${_armadillo_HEADER_CONTENTS}")
-
-    # WARNING: The number of spaces before the version name is not one.
-    string(REGEX REPLACE ".*#define ARMA_VERSION_NAME\ +\"([0-9a-zA-Z\ _-]+)\".*" "\\1" ARMADILLO_VERSION_NAME "${_armadillo_HEADER_CONTENTS}")
-
-    string(COMPARE EQUAL "${ARMADILLO_VERSION_MAJOR}" "${_armadillo_HEADER_CONTENTS}" EQUAL_STRING)
-    if (EQUAL_STRING)
-      string(REGEX REPLACE ".*static const unsigned int major = ([0-9]+).*" "\\1" ARMADILLO_VERSION_MAJOR "${_armadillo_HEADER_CONTENTS}")
-      string(REGEX REPLACE ".*static const unsigned int minor = ([0-9]+).*" "\\1" ARMADILLO_VERSION_MINOR "${_armadillo_HEADER_CONTENTS}")
-      string(REGEX REPLACE ".*static const unsigned int patch = ([0-9]+).*" "\\1" ARMADILLO_VERSION_PATCH "${_armadillo_HEADER_CONTENTS}")
-    endif (EQUAL_STRING)
-
-  endif(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/arma_version.hpp")
-
-  set(ARMADILLO_VERSION_STRING "${ARMADILLO_VERSION_MAJOR}.${ARMADILLO_VERSION_MINOR}.${ARMADILLO_VERSION_PATCH}")
-endif (ARMADILLO_INCLUDE_DIR)
-
-#======================
-
-
-# Checks 'RECQUIRED', 'QUIET' and versions.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Armadillo
-  REQUIRED_VARS ARMADILLO_LIBRARY ARMADILLO_INCLUDE_DIR)
-#  VERSION_VAR ARMADILLO_VERSION_STRING)
-# version_var fails with cmake < 2.8.4.
-
-if ("${ARMADILLO_VERSION_STRING}" VERSION_LESS "${Armadillo_FIND_VERSION}")
-  message(FATAL_ERROR "Armadillo version ${Armadillo_FIND_VERSION} required (found ${ARMADILLO_VERSION_STRING}).")
-else ("${ARMADILLO_VERSION_STRING}" VERSION_LESS "${Armadillo_FIND_VERSION}")
-  message(STATUS "Found Armadillo version ${ARMADILLO_VERSION_STRING} (required ${Armadillo_FIND_VERSION}).")
-endif ("${ARMADILLO_VERSION_STRING}" VERSION_LESS "${Armadillo_FIND_VERSION}")
-
-
-if (ARMADILLO_FOUND)
-  set(ARMADILLO_INCLUDE_DIRS ${ARMADILLO_INCLUDE_DIR})
-  set(ARMADILLO_LIBRARIES ${ARMADILLO_LIBRARY})
-endif (ARMADILLO_FOUND)
-
-
-# Hide internal variables
-mark_as_advanced(
-  ARMADILLO_INCLUDE_DIR
-  ARMADILLO_LIBRARY)
-
-#======================

Modified: mlpack/trunk/CMakeLists.txt
===================================================================
--- mlpack/trunk/CMakeLists.txt	2012-08-08 16:44:34 UTC (rev 13369)
+++ mlpack/trunk/CMakeLists.txt	2012-08-08 16:51:56 UTC (rev 13370)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.5)
 project(mlpack C CXX)
 
 # First, define all the compilation options.