[mlpack-git] master: Converts CMake commands to lower case (3f3d018)
gitdub at mlpack.org
gitdub at mlpack.org
Mon Mar 21 14:44:09 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/ca2519021ebecc3a5e8313058b78729286758a8b...24a224ab0465e8185118ce4120441490a25ab7be
>---------------------------------------------------------------
commit 3f3d018ea49372e6d428915d04e7846a1b71b633
Author: Alexander Leinoff <alexander-leinoff at uiowa.edu>
Date: Mon Mar 21 13:27:32 2016 -0500
Converts CMake commands to lower case
CMake commands are sometimes given in upper and lower case.
Previously uppercase commands had been required but now commands are
case-insensitive and lowercase commands are preferred. Conversion to lowercase
commands have been implemented in other open source projects such as ITK vxl
and BRAINSTools, and is the preferred style for KDE. Consistent style
practices help to improve readability and maintainability of code.
This was implemented with the shell script:
NOTE: MUST USE GNU compliant version of sed
cmake --help-command-list \
| grep -v "cmake version" \
| while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed \
&& git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' \
| xargs -0 gsed -i -f convert.sed \
&& rm convert.sed
This is a reimplementation of ITK commit
896f6b9220255bed1b3a1409af5257146b54e261
STYLE: Convert CMake-language commands lower case
Fixes #538
>---------------------------------------------------------------
3f3d018ea49372e6d428915d04e7846a1b71b633
CMake/ARMA_FindACML.cmake | 38 ++++++++++----------
CMake/ARMA_FindACMLMP.cmake | 38 ++++++++++----------
CMake/ARMA_FindARPACK.cmake | 36 +++++++++----------
CMake/ARMA_FindBLAS.cmake | 40 ++++++++++-----------
CMake/ARMA_FindCBLAS.cmake | 42 +++++++++++-----------
CMake/ARMA_FindCLAPACK.cmake | 44 +++++++++++------------
CMake/ARMA_FindLAPACK.cmake | 40 ++++++++++-----------
CMake/ARMA_FindMKL.cmake | 80 ++++++++++++++++++++---------------------
CMake/ARMA_FindOpenBLAS.cmake | 38 ++++++++++----------
CMake/FindLibDL.cmake | 4 +--
CMake/FindMatlabMex.cmake | 84 +++++++++++++++++++++----------------------
CMake/TargetDistclean.cmake | 8 ++---
CMakeLists.txt | 4 +--
13 files changed, 248 insertions(+), 248 deletions(-)
diff --git a/CMake/ARMA_FindACML.cmake b/CMake/ARMA_FindACML.cmake
index 784b6d5..4241bf9 100644
--- a/CMake/ARMA_FindACML.cmake
+++ b/CMake/ARMA_FindACML.cmake
@@ -5,33 +5,33 @@
# also defined, but not for general use are
# ACML_LIBRARY, where to find the ACML library.
-SET(ACML_NAMES ${ACML_NAMES} acml)
-FIND_LIBRARY(ACML_LIBRARY
+set(ACML_NAMES ${ACML_NAMES} acml)
+find_library(ACML_LIBRARY
NAMES ${ACML_NAMES}
PATHS /usr/lib64 /usr/lib /usr/*/lib64 /usr/*/lib /usr/*/gfortran64/lib/ /usr/*/gfortran32/lib/ /usr/local/lib64 /usr/local/lib /opt/lib64 /opt/lib /opt/*/lib64 /opt/*/lib /opt/*/gfortran64/lib/ /opt/*/gfortran32/lib/
)
-IF (ACML_LIBRARY)
- SET(ACML_LIBRARIES ${ACML_LIBRARY})
- SET(ACML_FOUND "YES")
-ELSE (ACML_LIBRARY)
- SET(ACML_FOUND "NO")
-ENDIF (ACML_LIBRARY)
+if (ACML_LIBRARY)
+ set(ACML_LIBRARIES ${ACML_LIBRARY})
+ set(ACML_FOUND "YES")
+else (ACML_LIBRARY)
+ set(ACML_FOUND "NO")
+endif (ACML_LIBRARY)
-IF (ACML_FOUND)
- IF (NOT ACML_FIND_QUIETLY)
- MESSAGE(STATUS "Found the ACML library: ${ACML_LIBRARIES}")
- ENDIF (NOT ACML_FIND_QUIETLY)
-ELSE (ACML_FOUND)
- IF (ACML_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find the ACML library")
- ENDIF (ACML_FIND_REQUIRED)
-ENDIF (ACML_FOUND)
+if (ACML_FOUND)
+ if (NOT ACML_FIND_QUIETLY)
+ message(STATUS "Found the ACML library: ${ACML_LIBRARIES}")
+ endif (NOT ACML_FIND_QUIETLY)
+else (ACML_FOUND)
+ if (ACML_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find the ACML library")
+ endif (ACML_FIND_REQUIRED)
+endif (ACML_FOUND)
# Deprecated declarations.
-GET_FILENAME_COMPONENT (NATIVE_ACML_LIB_PATH ${ACML_LIBRARY} PATH)
+get_filename_component (NATIVE_ACML_LIB_PATH ${ACML_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
ACML_LIBRARY
)
diff --git a/CMake/ARMA_FindACMLMP.cmake b/CMake/ARMA_FindACMLMP.cmake
index a075554..552103f 100644
--- a/CMake/ARMA_FindACMLMP.cmake
+++ b/CMake/ARMA_FindACMLMP.cmake
@@ -5,33 +5,33 @@
# also defined, but not for general use are
# ACMLMP_LIBRARY, where to find the ACMLMP library.
-SET(ACMLMP_NAMES ${ACMLMP_NAMES} acml_mp)
-FIND_LIBRARY(ACMLMP_LIBRARY
+set(ACMLMP_NAMES ${ACMLMP_NAMES} acml_mp)
+find_library(ACMLMP_LIBRARY
NAMES ${ACMLMP_NAMES}
PATHS /usr/lib64 /usr/lib /usr/*/lib64 /usr/*/lib /usr/*/gfortran64_mp/lib/ /usr/*/gfortran32_mp/lib/ /usr/local/lib64 /usr/local/lib /opt/lib64 /opt/lib /opt/*/lib64 /opt/*/lib /opt/*/gfortran64_mp/lib/ /opt/*/gfortran32_mp/lib/
)
-IF (ACMLMP_LIBRARY)
- SET(ACMLMP_LIBRARIES ${ACMLMP_LIBRARY})
- SET(ACMLMP_FOUND "YES")
-ELSE (ACMLMP_LIBRARY)
- SET(ACMLMP_FOUND "NO")
-ENDIF (ACMLMP_LIBRARY)
+if (ACMLMP_LIBRARY)
+ set(ACMLMP_LIBRARIES ${ACMLMP_LIBRARY})
+ set(ACMLMP_FOUND "YES")
+else (ACMLMP_LIBRARY)
+ set(ACMLMP_FOUND "NO")
+endif (ACMLMP_LIBRARY)
-IF (ACMLMP_FOUND)
- IF (NOT ACMLMP_FIND_QUIETLY)
- MESSAGE(STATUS "Found the ACMLMP library: ${ACMLMP_LIBRARIES}")
- ENDIF (NOT ACMLMP_FIND_QUIETLY)
-ELSE (ACMLMP_FOUND)
- IF (ACMLMP_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find the ACMLMP library")
- ENDIF (ACMLMP_FIND_REQUIRED)
-ENDIF (ACMLMP_FOUND)
+if (ACMLMP_FOUND)
+ if (NOT ACMLMP_FIND_QUIETLY)
+ message(STATUS "Found the ACMLMP library: ${ACMLMP_LIBRARIES}")
+ endif (NOT ACMLMP_FIND_QUIETLY)
+else (ACMLMP_FOUND)
+ if (ACMLMP_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find the ACMLMP library")
+ endif (ACMLMP_FIND_REQUIRED)
+endif (ACMLMP_FOUND)
# Deprecated declarations.
-GET_FILENAME_COMPONENT (NATIVE_ACMLMP_LIB_PATH ${ACMLMP_LIBRARY} PATH)
+get_filename_component (NATIVE_ACMLMP_LIB_PATH ${ACMLMP_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
ACMLMP_LIBRARY
)
diff --git a/CMake/ARMA_FindARPACK.cmake b/CMake/ARMA_FindARPACK.cmake
index afd791a..7509d74 100644
--- a/CMake/ARMA_FindARPACK.cmake
+++ b/CMake/ARMA_FindARPACK.cmake
@@ -11,29 +11,29 @@ find_library(ARPACK_LIBRARY
)
-IF (ARPACK_LIBRARY)
- SET(ARPACK_FOUND YES)
-ELSE ()
+if (ARPACK_LIBRARY)
+ set(ARPACK_FOUND YES)
+else ()
# Search for PARPACK.
find_library(ARPACK_LIBRARY
NAMES parpack
PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
- IF (ARPACK_LIBRARY)
- SET(ARPACK_FOUND YES)
- ELSE ()
- SET(ARPACK_FOUND NO)
- ENDIF ()
-ENDIF ()
+ if (ARPACK_LIBRARY)
+ set(ARPACK_FOUND YES)
+ else ()
+ set(ARPACK_FOUND NO)
+ endif ()
+endif ()
-IF (ARPACK_FOUND)
- IF (NOT ARPACK_FIND_QUIETLY)
- MESSAGE(STATUS "Found an ARPACK library: ${ARPACK_LIBRARY}")
- ENDIF (NOT ARPACK_FIND_QUIETLY)
-ELSE (ARPACK_FOUND)
- IF (ARPACK_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find an ARPACK library")
- ENDIF (ARPACK_FIND_REQUIRED)
-ENDIF (ARPACK_FOUND)
+if (ARPACK_FOUND)
+ if (NOT ARPACK_FIND_QUIETLY)
+ message(STATUS "Found an ARPACK library: ${ARPACK_LIBRARY}")
+ endif (NOT ARPACK_FIND_QUIETLY)
+else (ARPACK_FOUND)
+ if (ARPACK_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find an ARPACK library")
+ endif (ARPACK_FIND_REQUIRED)
+endif (ARPACK_FOUND)
diff --git a/CMake/ARMA_FindBLAS.cmake b/CMake/ARMA_FindBLAS.cmake
index 7cf8aa9..b210804 100644
--- a/CMake/ARMA_FindBLAS.cmake
+++ b/CMake/ARMA_FindBLAS.cmake
@@ -5,40 +5,40 @@
# also defined, but not for general use are
# BLAS_LIBRARY, where to find the BLAS library.
-SET(BLAS_NAMES ${BLAS_NAMES} blas)
+set(BLAS_NAMES ${BLAS_NAMES} blas)
# Find the ATLAS version preferentially.
-FIND_LIBRARY(BLAS_LIBRARY
+find_library(BLAS_LIBRARY
NAMES ${BLAS_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas
NO_DEFAULT_PATH)
-FIND_LIBRARY(BLAS_LIBRARY
+find_library(BLAS_LIBRARY
NAMES ${BLAS_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
-IF (BLAS_LIBRARY)
- SET(BLAS_LIBRARIES ${BLAS_LIBRARY})
- SET(BLAS_FOUND "YES")
-ELSE (BLAS_LIBRARY)
- SET(BLAS_FOUND "NO")
-ENDIF (BLAS_LIBRARY)
+if (BLAS_LIBRARY)
+ set(BLAS_LIBRARIES ${BLAS_LIBRARY})
+ set(BLAS_FOUND "YES")
+else (BLAS_LIBRARY)
+ set(BLAS_FOUND "NO")
+endif (BLAS_LIBRARY)
-IF (BLAS_FOUND)
- IF (NOT BLAS_FIND_QUIETLY)
- MESSAGE(STATUS "Found BLAS: ${BLAS_LIBRARIES}")
- ENDIF (NOT BLAS_FIND_QUIETLY)
-ELSE (BLAS_FOUND)
- IF (BLAS_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find BLAS")
- ENDIF (BLAS_FIND_REQUIRED)
-ENDIF (BLAS_FOUND)
+if (BLAS_FOUND)
+ if (NOT BLAS_FIND_QUIETLY)
+ message(STATUS "Found BLAS: ${BLAS_LIBRARIES}")
+ endif (NOT BLAS_FIND_QUIETLY)
+else (BLAS_FOUND)
+ if (BLAS_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find BLAS")
+ endif (BLAS_FIND_REQUIRED)
+endif (BLAS_FOUND)
# Deprecated declarations.
-GET_FILENAME_COMPONENT (NATIVE_BLAS_LIB_PATH ${BLAS_LIBRARY} PATH)
+get_filename_component (NATIVE_BLAS_LIB_PATH ${BLAS_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
BLAS_LIBRARY
)
diff --git a/CMake/ARMA_FindCBLAS.cmake b/CMake/ARMA_FindCBLAS.cmake
index ccd2133..14d2cff 100644
--- a/CMake/ARMA_FindCBLAS.cmake
+++ b/CMake/ARMA_FindCBLAS.cmake
@@ -6,42 +6,42 @@
# also defined, but not for general use are
# CBLAS_LIBRARY, where to find the library.
-FIND_PATH(CBLAS_INCLUDE_DIR cblas.h
+find_path(CBLAS_INCLUDE_DIR cblas.h
/usr/include/atlas/
/usr/local/include/atlas/
/usr/include/
/usr/local/include/
)
-SET(CBLAS_NAMES ${CBLAS_NAMES} cblas)
-FIND_LIBRARY(CBLAS_LIBRARY
+set(CBLAS_NAMES ${CBLAS_NAMES} cblas)
+find_library(CBLAS_LIBRARY
NAMES ${CBLAS_NAMES}
PATHS /usr/lib64/atlas-sse3 /usr/lib64/atlas /usr/lib64 /usr/local/lib64/atlas /usr/local/lib64 /usr/lib/atlas-sse3 /usr/lib/atlas-sse2 /usr/lib/atlas-sse /usr/lib/atlas-3dnow /usr/lib/atlas /usr/lib /usr/local/lib/atlas /usr/local/lib
)
-IF (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
- SET(CBLAS_LIBRARIES ${CBLAS_LIBRARY})
- SET(CBLAS_FOUND "YES")
-ELSE (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
- SET(CBLAS_FOUND "NO")
-ENDIF (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
+if (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
+ set(CBLAS_LIBRARIES ${CBLAS_LIBRARY})
+ set(CBLAS_FOUND "YES")
+else (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
+ set(CBLAS_FOUND "NO")
+endif (CBLAS_LIBRARY AND CBLAS_INCLUDE_DIR)
-IF (CBLAS_FOUND)
- IF (NOT CBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "Found a CBLAS library: ${CBLAS_LIBRARIES}")
- ENDIF (NOT CBLAS_FIND_QUIETLY)
-ELSE (CBLAS_FOUND)
- IF (CBLAS_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find a CBLAS library")
- ENDIF (CBLAS_FIND_REQUIRED)
-ENDIF (CBLAS_FOUND)
+if (CBLAS_FOUND)
+ if (NOT CBLAS_FIND_QUIETLY)
+ message(STATUS "Found a CBLAS library: ${CBLAS_LIBRARIES}")
+ endif (NOT CBLAS_FIND_QUIETLY)
+else (CBLAS_FOUND)
+ if (CBLAS_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find a CBLAS library")
+ endif (CBLAS_FIND_REQUIRED)
+endif (CBLAS_FOUND)
# Deprecated declarations.
-SET (NATIVE_CBLAS_INCLUDE_PATH ${CBLAS_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_CBLAS_LIB_PATH ${CBLAS_LIBRARY} PATH)
+set (NATIVE_CBLAS_INCLUDE_PATH ${CBLAS_INCLUDE_DIR} )
+get_filename_component (NATIVE_CBLAS_LIB_PATH ${CBLAS_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
CBLAS_LIBRARY
CBLAS_INCLUDE_DIR
)
diff --git a/CMake/ARMA_FindCLAPACK.cmake b/CMake/ARMA_FindCLAPACK.cmake
index 99dadae..21bedb4 100644
--- a/CMake/ARMA_FindCLAPACK.cmake
+++ b/CMake/ARMA_FindCLAPACK.cmake
@@ -6,43 +6,43 @@
# also defined, but not for general use are
# CLAPACK_LIBRARY, where to find the library.
-FIND_PATH(CLAPACK_INCLUDE_DIR clapack.h
+find_path(CLAPACK_INCLUDE_DIR clapack.h
/usr/include/atlas/
/usr/local/include/atlas/
/usr/include/
/usr/local/include/
)
-SET(CLAPACK_NAMES ${CLAPACK_NAMES} lapack_atlas)
-SET(CLAPACK_NAMES ${CLAPACK_NAMES} clapack)
-FIND_LIBRARY(CLAPACK_LIBRARY
+set(CLAPACK_NAMES ${CLAPACK_NAMES} lapack_atlas)
+set(CLAPACK_NAMES ${CLAPACK_NAMES} clapack)
+find_library(CLAPACK_LIBRARY
NAMES ${CLAPACK_NAMES}
PATHS /usr/lib64/atlas-sse3 /usr/lib64/atlas /usr/lib64 /usr/local/lib64/atlas /usr/local/lib64 /usr/lib/atlas-sse3 /usr/lib/atlas-sse2 /usr/lib/atlas-sse /usr/lib/atlas-3dnow /usr/lib/atlas /usr/lib /usr/local/lib/atlas /usr/local/lib
)
-IF (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
- SET(CLAPACK_LIBRARIES ${CLAPACK_LIBRARY})
- SET(CLAPACK_FOUND "YES")
-ELSE (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
- SET(CLAPACK_FOUND "NO")
-ENDIF (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
+if (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
+ set(CLAPACK_LIBRARIES ${CLAPACK_LIBRARY})
+ set(CLAPACK_FOUND "YES")
+else (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
+ set(CLAPACK_FOUND "NO")
+endif (CLAPACK_LIBRARY AND CLAPACK_INCLUDE_DIR)
-IF (CLAPACK_FOUND)
- IF (NOT CLAPACK_FIND_QUIETLY)
- MESSAGE(STATUS "Found a CLAPACK library: ${CLAPACK_LIBRARIES}")
- ENDIF (NOT CLAPACK_FIND_QUIETLY)
-ELSE (CLAPACK_FOUND)
- IF (CLAPACK_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find a CLAPACK library")
- ENDIF (CLAPACK_FIND_REQUIRED)
-ENDIF (CLAPACK_FOUND)
+if (CLAPACK_FOUND)
+ if (NOT CLAPACK_FIND_QUIETLY)
+ message(STATUS "Found a CLAPACK library: ${CLAPACK_LIBRARIES}")
+ endif (NOT CLAPACK_FIND_QUIETLY)
+else (CLAPACK_FOUND)
+ if (CLAPACK_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find a CLAPACK library")
+ endif (CLAPACK_FIND_REQUIRED)
+endif (CLAPACK_FOUND)
# Deprecated declarations.
-SET (NATIVE_CLAPACK_INCLUDE_PATH ${CLAPACK_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_CLAPACK_LIB_PATH ${CLAPACK_LIBRARY} PATH)
+set (NATIVE_CLAPACK_INCLUDE_PATH ${CLAPACK_INCLUDE_DIR} )
+get_filename_component (NATIVE_CLAPACK_LIB_PATH ${CLAPACK_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
CLAPACK_LIBRARY
CLAPACK_INCLUDE_DIR
)
diff --git a/CMake/ARMA_FindLAPACK.cmake b/CMake/ARMA_FindLAPACK.cmake
index fd0e92c..52e976e 100644
--- a/CMake/ARMA_FindLAPACK.cmake
+++ b/CMake/ARMA_FindLAPACK.cmake
@@ -5,40 +5,40 @@
# also defined, but not for general use are
# LAPACK_LIBRARY, where to find the LAPACK library.
-SET(LAPACK_NAMES ${LAPACK_NAMES} lapack)
+set(LAPACK_NAMES ${LAPACK_NAMES} lapack)
# Check ATLAS paths preferentially, using this necessary hack (I love CMake).
-FIND_LIBRARY(LAPACK_LIBRARY
+find_library(LAPACK_LIBRARY
NAMES ${LAPACK_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/local/lib64/atlas /usr/local/lib/atlas
NO_DEFAULT_PATH)
-FIND_LIBRARY(LAPACK_LIBRARY
+find_library(LAPACK_LIBRARY
NAMES ${LAPACK_NAMES}
PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
-IF (LAPACK_LIBRARY)
- SET(LAPACK_LIBRARIES ${LAPACK_LIBRARY})
- SET(LAPACK_FOUND "YES")
-ELSE (LAPACK_LIBRARY)
- SET(LAPACK_FOUND "NO")
-ENDIF (LAPACK_LIBRARY)
+if (LAPACK_LIBRARY)
+ set(LAPACK_LIBRARIES ${LAPACK_LIBRARY})
+ set(LAPACK_FOUND "YES")
+else (LAPACK_LIBRARY)
+ set(LAPACK_FOUND "NO")
+endif (LAPACK_LIBRARY)
-IF (LAPACK_FOUND)
- IF (NOT LAPACK_FIND_QUIETLY)
- MESSAGE(STATUS "Found LAPACK: ${LAPACK_LIBRARIES}")
- ENDIF (NOT LAPACK_FIND_QUIETLY)
-ELSE (LAPACK_FOUND)
- IF (LAPACK_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find LAPACK")
- ENDIF (LAPACK_FIND_REQUIRED)
-ENDIF (LAPACK_FOUND)
+if (LAPACK_FOUND)
+ if (NOT LAPACK_FIND_QUIETLY)
+ message(STATUS "Found LAPACK: ${LAPACK_LIBRARIES}")
+ endif (NOT LAPACK_FIND_QUIETLY)
+else (LAPACK_FOUND)
+ if (LAPACK_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find LAPACK")
+ endif (LAPACK_FIND_REQUIRED)
+endif (LAPACK_FOUND)
# Deprecated declarations.
-GET_FILENAME_COMPONENT (NATIVE_LAPACK_LIB_PATH ${LAPACK_LIBRARY} PATH)
+get_filename_component (NATIVE_LAPACK_LIB_PATH ${LAPACK_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
LAPACK_LIBRARY
)
diff --git a/CMake/ARMA_FindMKL.cmake b/CMake/ARMA_FindMKL.cmake
index 1f8b8eb..f6615dd 100644
--- a/CMake/ARMA_FindMKL.cmake
+++ b/CMake/ARMA_FindMKL.cmake
@@ -3,47 +3,47 @@
# MKL_LIBRARIES, the libraries needed to use Intel's implementation of BLAS & LAPACK.
# MKL_FOUND, If false, do not try to use MKL.
-SET(MKL_NAMES ${MKL_NAMES} mkl_lapack)
-SET(MKL_NAMES ${MKL_NAMES} mkl_intel_thread)
-SET(MKL_NAMES ${MKL_NAMES} mkl_core)
-SET(MKL_NAMES ${MKL_NAMES} guide)
-SET(MKL_NAMES ${MKL_NAMES} mkl)
-SET(MKL_NAMES ${MKL_NAMES} iomp5)
-#SET(MKL_NAMES ${MKL_NAMES} pthread)
-
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(MKL_NAMES ${MKL_NAMES} mkl_intel_lp64)
-ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(MKL_NAMES ${MKL_NAMES} mkl_intel)
-ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-FOREACH (MKL_NAME ${MKL_NAMES})
- FIND_LIBRARY(${MKL_NAME}_LIBRARY
+set(MKL_NAMES ${MKL_NAMES} mkl_lapack)
+set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread)
+set(MKL_NAMES ${MKL_NAMES} mkl_core)
+set(MKL_NAMES ${MKL_NAMES} guide)
+set(MKL_NAMES ${MKL_NAMES} mkl)
+set(MKL_NAMES ${MKL_NAMES} iomp5)
+#set(MKL_NAMES ${MKL_NAMES} pthread)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(MKL_NAMES ${MKL_NAMES} mkl_intel_lp64)
+else(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(MKL_NAMES ${MKL_NAMES} mkl_intel)
+endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+foreach (MKL_NAME ${MKL_NAMES})
+ find_library(${MKL_NAME}_LIBRARY
NAMES ${MKL_NAME}
PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /opt/intel/lib/intel64 /opt/intel/lib/ia32 /opt/intel/mkl/lib/lib64 /opt/intel/mkl/lib/intel64 /opt/intel/mkl/lib/ia32 /opt/intel/mkl/lib /opt/intel/*/mkl/lib/intel64 /opt/intel/*/mkl/lib/ia32/ /opt/mkl/*/lib/em64t /opt/mkl/*/lib/32 /opt/intel/mkl/*/lib/em64t /opt/intel/mkl/*/lib/32
)
- SET(TMP_LIBRARY ${${MKL_NAME}_LIBRARY})
-
- IF(TMP_LIBRARY)
- SET(MKL_LIBRARIES ${MKL_LIBRARIES} ${TMP_LIBRARY})
- ENDIF(TMP_LIBRARY)
-ENDFOREACH(MKL_NAME)
-
-IF (MKL_LIBRARIES)
- SET(MKL_FOUND "YES")
-ELSE (MKL_LIBRARIES)
- SET(MKL_FOUND "NO")
-ENDIF (MKL_LIBRARIES)
-
-IF (MKL_FOUND)
- IF (NOT MKL_FIND_QUIETLY)
- MESSAGE(STATUS "Found MKL libraries: ${MKL_LIBRARIES}")
- ENDIF (NOT MKL_FIND_QUIETLY)
-ELSE (MKL_FOUND)
- IF (MKL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find MKL libraries")
- ENDIF (MKL_FIND_REQUIRED)
-ENDIF (MKL_FOUND)
-
-# MARK_AS_ADVANCED(MKL_LIBRARY)
+ set(TMP_LIBRARY ${${MKL_NAME}_LIBRARY})
+
+ if(TMP_LIBRARY)
+ set(MKL_LIBRARIES ${MKL_LIBRARIES} ${TMP_LIBRARY})
+ endif(TMP_LIBRARY)
+endforeach(MKL_NAME)
+
+if (MKL_LIBRARIES)
+ set(MKL_FOUND "YES")
+else (MKL_LIBRARIES)
+ set(MKL_FOUND "NO")
+endif (MKL_LIBRARIES)
+
+if (MKL_FOUND)
+ if (NOT MKL_FIND_QUIETLY)
+ message(STATUS "Found MKL libraries: ${MKL_LIBRARIES}")
+ endif (NOT MKL_FIND_QUIETLY)
+else (MKL_FOUND)
+ if (MKL_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find MKL libraries")
+ endif (MKL_FIND_REQUIRED)
+endif (MKL_FOUND)
+
+# mark_as_advanced(MKL_LIBRARY)
diff --git a/CMake/ARMA_FindOpenBLAS.cmake b/CMake/ARMA_FindOpenBLAS.cmake
index b42abe6..343c334 100644
--- a/CMake/ARMA_FindOpenBLAS.cmake
+++ b/CMake/ARMA_FindOpenBLAS.cmake
@@ -5,33 +5,33 @@
# also defined, but not for general use are
# OpenBLAS_LIBRARY, where to find the OpenBLAS library.
-SET(OpenBLAS_NAMES ${OpenBLAS_NAMES} openblas)
-FIND_LIBRARY(OpenBLAS_LIBRARY
+set(OpenBLAS_NAMES ${OpenBLAS_NAMES} openblas)
+find_library(OpenBLAS_LIBRARY
NAMES ${OpenBLAS_NAMES}
PATHS /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
)
-IF (OpenBLAS_LIBRARY)
- SET(OpenBLAS_LIBRARIES ${OpenBLAS_LIBRARY})
- SET(OpenBLAS_FOUND "YES")
-ELSE (OpenBLAS_LIBRARY)
- SET(OpenBLAS_FOUND "NO")
-ENDIF (OpenBLAS_LIBRARY)
+if (OpenBLAS_LIBRARY)
+ set(OpenBLAS_LIBRARIES ${OpenBLAS_LIBRARY})
+ set(OpenBLAS_FOUND "YES")
+else (OpenBLAS_LIBRARY)
+ set(OpenBLAS_FOUND "NO")
+endif (OpenBLAS_LIBRARY)
-IF (OpenBLAS_FOUND)
- IF (NOT OpenBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "Found the OpenBLAS library: ${OpenBLAS_LIBRARIES}")
- ENDIF (NOT OpenBLAS_FIND_QUIETLY)
-ELSE (OpenBLAS_FOUND)
- IF (OpenBLAS_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find the OpenBLAS library")
- ENDIF (OpenBLAS_FIND_REQUIRED)
-ENDIF (OpenBLAS_FOUND)
+if (OpenBLAS_FOUND)
+ if (NOT OpenBLAS_FIND_QUIETLY)
+ message(STATUS "Found the OpenBLAS library: ${OpenBLAS_LIBRARIES}")
+ endif (NOT OpenBLAS_FIND_QUIETLY)
+else (OpenBLAS_FOUND)
+ if (OpenBLAS_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find the OpenBLAS library")
+ endif (OpenBLAS_FIND_REQUIRED)
+endif (OpenBLAS_FOUND)
# Deprecated declarations.
-GET_FILENAME_COMPONENT (NATIVE_OpenBLAS_LIB_PATH ${OpenBLAS_LIBRARY} PATH)
+get_filename_component (NATIVE_OpenBLAS_LIB_PATH ${OpenBLAS_LIBRARY} PATH)
-MARK_AS_ADVANCED(
+mark_as_advanced(
OpenBLAS_LIBRARY
)
diff --git a/CMake/FindLibDL.cmake b/CMake/FindLibDL.cmake
index 52fd399..dcbd4aa 100644
--- a/CMake/FindLibDL.cmake
+++ b/CMake/FindLibDL.cmake
@@ -15,8 +15,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibDL DEFAULT_MSG
LIBDL_LIBRARIES
LIBDL_INCLUDE_DIRS)
-SET(CMAKE_REQUIRED_LIBRARIES dl)
-INCLUDE(CheckCSourceRuns)
+set(CMAKE_REQUIRED_LIBRARIES dl)
+include(CheckCSourceRuns)
CHECK_C_SOURCE_RUNS("#include <dlfcn.h>
#include <stdlib.h>
void testfunc() {}
diff --git a/CMake/FindMatlabMex.cmake b/CMake/FindMatlabMex.cmake
index 58c0519..ec8b910 100644
--- a/CMake/FindMatlabMex.cmake
+++ b/CMake/FindMatlabMex.cmake
@@ -4,69 +4,69 @@
# MATLAB_ROOT: root of MATLAB installation
# MATLABMEX_FOUND: 0 if not found, 1 if found
-SET(MATLABMEX_FOUND 0)
+set(MATLABMEX_FOUND 0)
-IF(WIN32)
+if(WIN32)
# This is untested but taken from the older FindMatlab.cmake script as well as
# the modifications by Ramon Casero and Tom Doel for Gerardus.
# Search for a version of Matlab available, starting from the most modern one
# to older versions.
- FOREACH(MATVER "7.20" "7.19" "7.18" "7.17" "7.16" "7.15" "7.14" "7.13" "7.12"
+ foreach(MATVER "7.20" "7.19" "7.18" "7.17" "7.16" "7.15" "7.14" "7.13" "7.12"
"7.11" "7.10" "7.9" "7.8" "7.7" "7.6" "7.5" "7.4")
- IF((NOT DEFINED MATLAB_ROOT)
+ if((NOT DEFINED MATLAB_ROOT)
OR ("${MATLAB_ROOT}" STREQUAL "")
OR ("${MATLAB_ROOT}" STREQUAL "/registry"))
- GET_FILENAME_COMPONENT(MATLAB_ROOT
+ get_filename_component(MATLAB_ROOT
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${MATVER};MATLABROOT]"
ABSOLUTE)
- SET(MATLAB_VERSION ${MATVER})
- ENDIF((NOT DEFINED MATLAB_ROOT)
+ set(MATLAB_VERSION ${MATVER})
+ endif((NOT DEFINED MATLAB_ROOT)
OR ("${MATLAB_ROOT}" STREQUAL "")
OR ("${MATLAB_ROOT}" STREQUAL "/registry"))
- ENDFOREACH(MATVER)
+ endforeach(MATVER)
- FIND_PROGRAM(MATLAB_MEX
+ find_program(MATLAB_MEX
mex
${MATLAB_ROOT}/bin
)
-ELSE(WIN32)
+else(WIN32)
# Check if this is a Mac.
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# This code is untested but taken from the older FindMatlab.cmake script as
# well as the modifications by Ramon Casero and Tom Doel for Gerardus.
- SET(LIBRARY_EXTENSION .dylib)
+ set(LIBRARY_EXTENSION .dylib)
# If this is a Mac and the attempts to find MATLAB_ROOT have so far failed,~
# we look in the applications folder
- IF((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
+ if((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
# Search for a version of Matlab available, starting from the most modern
# one to older versions
- FOREACH(MATVER "R2013b" "R2013a" "R2012b" "R2012a" "R2011b" "R2011a"
+ foreach(MATVER "R2013b" "R2013a" "R2012b" "R2012a" "R2011b" "R2011a"
"R2010b" "R2010a" "R2009b" "R2009a" "R2008b")
- IF((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
- IF(EXISTS /Applications/MATLAB_${MATVER}.app)
- SET(MATLAB_ROOT /Applications/MATLAB_${MATVER}.app)
+ if((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
+ if(EXISTS /Applications/MATLAB_${MATVER}.app)
+ set(MATLAB_ROOT /Applications/MATLAB_${MATVER}.app)
- ENDIF(EXISTS /Applications/MATLAB_${MATVER}.app)
- ENDIF((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
- ENDFOREACH(MATVER)
+ endif(EXISTS /Applications/MATLAB_${MATVER}.app)
+ endif((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
+ endforeach(MATVER)
- ENDIF((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
+ endif((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
- FIND_PROGRAM(MATLAB_MEX
+ find_program(MATLAB_MEX
mex
PATHS
${MATLAB_ROOT}/bin
)
- ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# On a Linux system. The goal is to find MATLAB_ROOT.
- SET(LIBRARY_EXTENSION .so)
+ set(LIBRARY_EXTENSION .so)
- FIND_PROGRAM(MATLAB_MEX_POSSIBLE_LINK
+ find_program(MATLAB_MEX_POSSIBLE_LINK
mex
PATHS
${MATLAB_ROOT}/bin
@@ -85,24 +85,24 @@ ELSE(WIN32)
$ENV{HOME}/matlab_[rR]20[0-9][0-9][abAB]/bin
)
- GET_FILENAME_COMPONENT(MATLAB_MEX "${MATLAB_MEX_POSSIBLE_LINK}" REALPATH)
- GET_FILENAME_COMPONENT(MATLAB_BIN_ROOT "${MATLAB_MEX}" PATH)
+ get_filename_component(MATLAB_MEX "${MATLAB_MEX_POSSIBLE_LINK}" REALPATH)
+ get_filename_component(MATLAB_BIN_ROOT "${MATLAB_MEX}" PATH)
# Strip ./bin/.
- GET_FILENAME_COMPONENT(MATLAB_ROOT "${MATLAB_BIN_ROOT}" PATH)
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-ENDIF(WIN32)
-
-IF(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
- MESSAGE(FATAL_ERROR "Could not find MATLAB mex compiler; try specifying MATLAB_ROOT.")
-ELSE(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
- IF(EXISTS "${MATLAB_MEX}")
- MESSAGE(STATUS "Found MATLAB mex compiler: ${MATLAB_MEX}")
- MESSAGE(STATUS "MATLAB root: ${MATLAB_ROOT}")
- SET(MATLABMEX_FOUND 1)
- ENDIF(EXISTS "${MATLAB_MEX}")
-ENDIF(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
-
-MARK_AS_ADVANCED(
+ get_filename_component(MATLAB_ROOT "${MATLAB_BIN_ROOT}" PATH)
+ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+endif(WIN32)
+
+if(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+ message(FATAL_ERROR "Could not find MATLAB mex compiler; try specifying MATLAB_ROOT.")
+else(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+ if(EXISTS "${MATLAB_MEX}")
+ message(STATUS "Found MATLAB mex compiler: ${MATLAB_MEX}")
+ message(STATUS "MATLAB root: ${MATLAB_ROOT}")
+ set(MATLABMEX_FOUND 1)
+ endif(EXISTS "${MATLAB_MEX}")
+endif(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+
+mark_as_advanced(
MATLAB_MEX
MATLABMEX_FOUND
MATLAB_ROOT
diff --git a/CMake/TargetDistclean.cmake b/CMake/TargetDistclean.cmake
index 3eefb8b..87030d6 100644
--- a/CMake/TargetDistclean.cmake
+++ b/CMake/TargetDistclean.cmake
@@ -7,11 +7,11 @@
# hate at http://itk.org/Bug/view.php?id=6647
# yacked and brought out of 2003 by rcurtin
-IF (UNIX)
+if (UNIX)
# since it's unix-specific we will use bash
- ADD_CUSTOM_TARGET (distclean @echo cleaning ${FASTLIB_SOURCE_DIR} for source distribution)
+ add_custom_target (distclean @echo cleaning ${FASTLIB_SOURCE_DIR} for source distribution)
- ADD_CUSTOM_COMMAND(TARGET distclean
+ add_custom_command(TARGET distclean
COMMAND make ARGS clean
COMMAND find ARGS ${FASTLIB_SOURCE_DIR} -iname CMakeCache.txt -delete
COMMAND find ARGS ${FASTLIB_SOURCE_DIR} -iname cmake_install.cmake -delete
@@ -19,4 +19,4 @@ IF (UNIX)
COMMAND find ARGS ${FASTLIB_SOURCE_DIR} -depth -type d -iname CMakeFiles -exec rm -rf {} \;
COMMAND rm ARGS -rf bin lib include
VERBATIM )
-ENDIF(UNIX)
+endif(UNIX)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e4525d..b29034d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,10 +36,10 @@ endif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# math.h functions, making -lm unnecessary with gcc, but it may still be
# necessary with clang.
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- IF (APPLE)
+ if (APPLE)
# detect OS X version. Use '/usr/bin/sw_vers -productVersion' to
# extract V from '10.V.x'.)
- EXEC_PROGRAM(/usr/bin/sw_vers ARGS
+ exec_program(/usr/bin/sw_vers ARGS
-productVersion OUTPUT_VARIABLE MACOSX_VERSION_RAW)
string(REGEX REPLACE
"10\\.([0-9]+).*" "\\1"
More information about the mlpack-git
mailing list