diff options
Diffstat (limited to 'bench/btl/cmake')
-rw-r--r-- | bench/btl/cmake/FindACML.cmake | 2 | ||||
-rw-r--r-- | bench/btl/cmake/FindATLAS.cmake | 4 | ||||
-rw-r--r-- | bench/btl/cmake/FindBLAZE.cmake | 4 | ||||
-rw-r--r-- | bench/btl/cmake/FindBlitz.cmake | 2 | ||||
-rw-r--r-- | bench/btl/cmake/FindCBLAS.cmake | 2 | ||||
-rw-r--r-- | bench/btl/cmake/FindGMM.cmake | 4 | ||||
-rw-r--r-- | bench/btl/cmake/FindMKL.cmake | 8 | ||||
-rw-r--r-- | bench/btl/cmake/FindMTL4.cmake | 4 | ||||
-rw-r--r-- | bench/btl/cmake/FindOPENBLAS.cmake | 2 | ||||
-rw-r--r-- | bench/btl/cmake/FindPackageHandleStandardArgs.cmake | 70 | ||||
-rw-r--r-- | bench/btl/cmake/FindTvmet.cmake | 4 | ||||
-rw-r--r-- | bench/btl/cmake/MacroOptionalAddSubdirectory.cmake | 30 |
12 files changed, 68 insertions, 68 deletions
diff --git a/bench/btl/cmake/FindACML.cmake b/bench/btl/cmake/FindACML.cmake index 4989fa2f4..daeeb535d 100644 --- a/bench/btl/cmake/FindACML.cmake +++ b/bench/btl/cmake/FindACML.cmake @@ -1,7 +1,7 @@ if (ACML_LIBRARIES) set(ACML_FIND_QUIETLY TRUE) -endif (ACML_LIBRARIES) +endif () find_library(ACML_LIBRARIES NAMES diff --git a/bench/btl/cmake/FindATLAS.cmake b/bench/btl/cmake/FindATLAS.cmake index 4136a989d..572a4c0b2 100644 --- a/bench/btl/cmake/FindATLAS.cmake +++ b/bench/btl/cmake/FindATLAS.cmake @@ -1,7 +1,7 @@ if (ATLAS_LIBRARIES) set(ATLAS_FIND_QUIETLY TRUE) -endif (ATLAS_LIBRARIES) +endif () find_file(ATLAS_LIB libatlas.so.3 PATHS /usr/lib /usr/lib/atlas /usr/lib64 /usr/lib64/atlas $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) find_library(ATLAS_LIB satlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) @@ -23,7 +23,7 @@ if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) # set(ATLAS_LIBRARIES ${ATLAS_LIBRARIES} ${ATLAS_REFERENCE_LAPACK}) # endif() -endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ATLAS DEFAULT_MSG ATLAS_LIBRARIES) diff --git a/bench/btl/cmake/FindBLAZE.cmake b/bench/btl/cmake/FindBLAZE.cmake index dba4c89f2..18a878ff9 100644 --- a/bench/btl/cmake/FindBLAZE.cmake +++ b/bench/btl/cmake/FindBLAZE.cmake @@ -15,7 +15,7 @@ if (BLAZE_INCLUDE_DIR) # in cache already set(BLAZE_FOUND TRUE) -else (BLAZE_INCLUDE_DIR) +else () find_path(BLAZE_INCLUDE_DIR NAMES blaze/Blaze.h PATHS @@ -27,5 +27,5 @@ find_package_handle_standard_args(BLAZE DEFAULT_MSG BLAZE_INCLUDE_DIR) mark_as_advanced(BLAZE_INCLUDE_DIR) -endif(BLAZE_INCLUDE_DIR) +endif() diff --git a/bench/btl/cmake/FindBlitz.cmake b/bench/btl/cmake/FindBlitz.cmake index 92880bbed..7ab375fd8 100644 --- a/bench/btl/cmake/FindBlitz.cmake +++ b/bench/btl/cmake/FindBlitz.cmake @@ -15,7 +15,7 @@ if (BLITZ_INCLUDES AND BLITZ_LIBRARIES) set(Blitz_FIND_QUIETLY TRUE) -endif (BLITZ_INCLUDES AND BLITZ_LIBRARIES) +endif () find_path(BLITZ_INCLUDES NAMES diff --git a/bench/btl/cmake/FindCBLAS.cmake b/bench/btl/cmake/FindCBLAS.cmake index ce0f2f2b2..43a90f7f6 100644 --- a/bench/btl/cmake/FindCBLAS.cmake +++ b/bench/btl/cmake/FindCBLAS.cmake @@ -2,7 +2,7 @@ if (CBLAS_INCLUDES AND CBLAS_LIBRARIES) set(CBLAS_FIND_QUIETLY TRUE) -endif (CBLAS_INCLUDES AND CBLAS_LIBRARIES) +endif () find_path(CBLAS_INCLUDES NAMES diff --git a/bench/btl/cmake/FindGMM.cmake b/bench/btl/cmake/FindGMM.cmake index 5049c64ed..ff45e6a0c 100644 --- a/bench/btl/cmake/FindGMM.cmake +++ b/bench/btl/cmake/FindGMM.cmake @@ -1,7 +1,7 @@ if (GMM_INCLUDE_DIR) # in cache already set(GMM_FOUND TRUE) -else (GMM_INCLUDE_DIR) +else () find_path(GMM_INCLUDE_DIR NAMES gmm/gmm.h PATHS @@ -14,4 +14,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMM DEFAULT_MSG GMM_INCLUDE_DIR ) mark_as_advanced(GMM_INCLUDE_DIR) -endif(GMM_INCLUDE_DIR) +endif() diff --git a/bench/btl/cmake/FindMKL.cmake b/bench/btl/cmake/FindMKL.cmake index f4d7c6ebe..23e77279a 100644 --- a/bench/btl/cmake/FindMKL.cmake +++ b/bench/btl/cmake/FindMKL.cmake @@ -1,7 +1,7 @@ if (MKL_LIBRARIES) set(MKL_FIND_QUIETLY TRUE) -endif (MKL_LIBRARIES) +endif () if(CMAKE_MINOR_VERSION GREATER 4) @@ -30,7 +30,7 @@ if(MKL_LIBRARIES AND MKL_GUIDE) set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential ${MKL_GUIDE} pthread) endif() -else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") +else() find_library(MKL_LIBRARIES mkl_core @@ -55,9 +55,9 @@ if(MKL_LIBRARIES AND MKL_GUIDE) set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential ${MKL_GUIDE} pthread) endif() -endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") +endif() -endif(CMAKE_MINOR_VERSION GREATER 4) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MKL DEFAULT_MSG MKL_LIBRARIES) diff --git a/bench/btl/cmake/FindMTL4.cmake b/bench/btl/cmake/FindMTL4.cmake index 3de490980..1bafc93a6 100644 --- a/bench/btl/cmake/FindMTL4.cmake +++ b/bench/btl/cmake/FindMTL4.cmake @@ -15,7 +15,7 @@ if (MTL4_INCLUDE_DIR) # in cache already set(MTL4_FOUND TRUE) -else (MTL4_INCLUDE_DIR) +else () find_path(MTL4_INCLUDE_DIR NAMES boost/numeric/mtl/mtl.hpp PATHS @@ -27,5 +27,5 @@ find_package_handle_standard_args(MTL4 DEFAULT_MSG MTL4_INCLUDE_DIR) mark_as_advanced(MTL4_INCLUDE_DIR) -endif(MTL4_INCLUDE_DIR) +endif() diff --git a/bench/btl/cmake/FindOPENBLAS.cmake b/bench/btl/cmake/FindOPENBLAS.cmake index 2a0919436..5c0762306 100644 --- a/bench/btl/cmake/FindOPENBLAS.cmake +++ b/bench/btl/cmake/FindOPENBLAS.cmake @@ -1,7 +1,7 @@ if (OPENBLAS_LIBRARIES) set(OPENBLAS_FIND_QUIETLY TRUE) -endif (OPENBLAS_LIBRARIES) +endif () find_file(OPENBLAS_LIBRARIES NAMES libopenblas.so libopenblas.so.0 PATHS /usr/lib /usr/lib64 $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR}) find_library(OPENBLAS_LIBRARIES openblas PATHS $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR}) diff --git a/bench/btl/cmake/FindPackageHandleStandardArgs.cmake b/bench/btl/cmake/FindPackageHandleStandardArgs.cmake index 7f122edcd..05d7e65bd 100644 --- a/bench/btl/cmake/FindPackageHandleStandardArgs.cmake +++ b/bench/btl/cmake/FindPackageHandleStandardArgs.cmake @@ -1,7 +1,7 @@ # FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) # # This macro is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and +# It handles the REQUIRED and QUIET argument to find_package() and # it also sets the <UPPERCASED_NAME>_FOUND variable. # The package is found if all variables listed are TRUE. # Example: @@ -19,42 +19,42 @@ # be "Could NOT find LibXml2", if you don't like this message you can specify # your own custom failure message there. -MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) +macro(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) - IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - IF (${_NAME}_FIND_REQUIRED) - SET(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}") - ELSE (${_NAME}_FIND_REQUIRED) - SET(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}") - ENDIF (${_NAME}_FIND_REQUIRED) - ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - SET(_FAIL_MESSAGE "${_FAIL_MSG}") - ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + if("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + if (${_NAME}_FIND_REQUIRED) + set(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}") + else (${_NAME}_FIND_REQUIRED) + set(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}") + endif (${_NAME}_FIND_REQUIRED) + else("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + set(_FAIL_MESSAGE "${_FAIL_MSG}") + endif("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - STRING(TOUPPER ${_NAME} _NAME_UPPER) + string(TOUPPER ${_NAME} _NAME_UPPER) - SET(${_NAME_UPPER}_FOUND TRUE) - IF(NOT ${_VAR1}) - SET(${_NAME_UPPER}_FOUND FALSE) - ENDIF(NOT ${_VAR1}) + set(${_NAME_UPPER}_FOUND TRUE) + if(NOT ${_VAR1}) + set(${_NAME_UPPER}_FOUND FALSE) + endif(NOT ${_VAR1}) - FOREACH(_CURRENT_VAR ${ARGN}) - IF(NOT ${_CURRENT_VAR}) - SET(${_NAME_UPPER}_FOUND FALSE) - ENDIF(NOT ${_CURRENT_VAR}) - ENDFOREACH(_CURRENT_VAR) + foreach(_CURRENT_VAR ${ARGN}) + if(NOT ${_CURRENT_VAR}) + set(${_NAME_UPPER}_FOUND FALSE) + endif(NOT ${_CURRENT_VAR}) + endforeach(_CURRENT_VAR) - IF (${_NAME_UPPER}_FOUND) - IF (NOT ${_NAME}_FIND_QUIETLY) - MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}") - ENDIF (NOT ${_NAME}_FIND_QUIETLY) - ELSE (${_NAME_UPPER}_FOUND) - IF (${_NAME}_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}") - ELSE (${_NAME}_FIND_REQUIRED) - IF (NOT ${_NAME}_FIND_QUIETLY) - MESSAGE(STATUS "${_FAIL_MESSAGE}") - ENDIF (NOT ${_NAME}_FIND_QUIETLY) - ENDIF (${_NAME}_FIND_REQUIRED) - ENDIF (${_NAME_UPPER}_FOUND) -ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS) + if (${_NAME_UPPER}_FOUND) + if (NOT ${_NAME}_FIND_QUIETLY) + message(STATUS "Found ${_NAME}: ${${_VAR1}}") + endif (NOT ${_NAME}_FIND_QUIETLY) + else (${_NAME_UPPER}_FOUND) + if (${_NAME}_FIND_REQUIRED) + message(FATAL_ERROR "${_FAIL_MESSAGE}") + else (${_NAME}_FIND_REQUIRED) + if (NOT ${_NAME}_FIND_QUIETLY) + message(STATUS "${_FAIL_MESSAGE}") + endif (NOT ${_NAME}_FIND_QUIETLY) + endif (${_NAME}_FIND_REQUIRED) + endif (${_NAME_UPPER}_FOUND) +endmacro(FIND_PACKAGE_HANDLE_STANDARD_ARGS) diff --git a/bench/btl/cmake/FindTvmet.cmake b/bench/btl/cmake/FindTvmet.cmake index 26a29d965..8ccae271b 100644 --- a/bench/btl/cmake/FindTvmet.cmake +++ b/bench/btl/cmake/FindTvmet.cmake @@ -15,7 +15,7 @@ if (TVMET_INCLUDE_DIR) # in cache already set(TVMET_FOUND TRUE) -else (TVMET_INCLUDE_DIR) +else () find_path(TVMET_INCLUDE_DIR NAMES tvmet/tvmet.h PATHS @@ -28,5 +28,5 @@ find_package_handle_standard_args(Tvmet DEFAULT_MSG TVMET_INCLUDE_DIR) mark_as_advanced(TVMET_INCLUDE_DIR) -endif(TVMET_INCLUDE_DIR) +endif() diff --git a/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake b/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake index 545048b68..8d46fcea2 100644 --- a/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake +++ b/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake @@ -1,6 +1,6 @@ -# - MACRO_OPTIONAL_ADD_SUBDIRECTORY() combines ADD_SUBDIRECTORY() with an OPTION() +# - MACRO_OPTIONAL_ADD_SUBDIRECTORY() combines add_subdirectory() with an option() # MACRO_OPTIONAL_ADD_SUBDIRECTORY( <dir> ) -# If you use MACRO_OPTIONAL_ADD_SUBDIRECTORY() instead of ADD_SUBDIRECTORY(), +# If you use MACRO_OPTIONAL_ADD_SUBDIRECTORY() instead of add_subdirectory(), # this will have two effects # 1 - CMake will not complain if the directory doesn't exist # This makes sense if you want to distribute just one of the subdirs @@ -16,16 +16,16 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) - GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE) - IF(EXISTS ${_fullPath}) - IF(${ARGC} EQUAL 2) - OPTION(BUILD_${_dir} "Build directory ${_dir}" ${ARGV1}) - ELSE(${ARGC} EQUAL 2) - OPTION(BUILD_${_dir} "Build directory ${_dir}" TRUE) - ENDIF(${ARGC} EQUAL 2) - IF(BUILD_${_dir}) - ADD_SUBDIRECTORY(${_dir}) - ENDIF(BUILD_${_dir}) - ENDIF(EXISTS ${_fullPath}) -ENDMACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY) +macro (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) + get_filename_component(_fullPath ${_dir} ABSOLUTE) + if(EXISTS ${_fullPath}) + if(${ARGC} EQUAL 2) + option(BUILD_${_dir} "Build directory ${_dir}" ${ARGV1}) + else(${ARGC} EQUAL 2) + option(BUILD_${_dir} "Build directory ${_dir}" TRUE) + endif(${ARGC} EQUAL 2) + if(BUILD_${_dir}) + add_subdirectory(${_dir}) + endif(BUILD_${_dir}) + endif(EXISTS ${_fullPath}) +endmacro (MACRO_OPTIONAL_ADD_SUBDIRECTORY) |