From be3197a4eb34453a5eef5ff34093d4b77e860d08 Mon Sep 17 00:00:00 2001 From: conrad Date: Tue, 12 Jul 2022 13:10:00 +1000 Subject: [PATCH] rename internal cmake-related option for clarity --- CMakeLists.txt | 6 +++--- include/armadillo_bits/config.hpp | 8 ++++---- include/armadillo_bits/config.hpp.cmake | 8 ++++---- include/armadillo_bits/def_hdf5.hpp | 2 +- include/armadillo_bits/include_hdf5.hpp | 6 +++--- src/wrapper1.cpp | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c5eabde..e5dcf54a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(ARMA_USE_WRAPPER true) set(ARMA_USE_LAPACK false) set(ARMA_USE_BLAS false) set(ARMA_USE_ATLAS false) -set(ARMA_USE_HDF5_ALT false) +set(ARMA_USE_HDF5_CMAKE false) set(ARMA_USE_ARPACK false) set(ARMA_USE_EXTERN_RNG false) set(ARMA_USE_SUPERLU false) # Caveat: only SuperLU version 5.x can be used! @@ -480,7 +480,7 @@ if(DETECT_HDF5) message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") if(HDF5_FOUND) - set(ARMA_USE_HDF5_ALT true) + set(ARMA_USE_HDF5_CMAKE true) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) # Since we called HDF5 with no arguments, the script will find only the C @@ -543,7 +543,7 @@ message(STATUS "*** ARMA_USE_WRAPPER = ${ARMA_USE_WRAPPER}") message(STATUS "*** ARMA_USE_LAPACK = ${ARMA_USE_LAPACK}") message(STATUS "*** ARMA_USE_BLAS = ${ARMA_USE_BLAS}") message(STATUS "*** ARMA_USE_ATLAS = ${ARMA_USE_ATLAS}") -message(STATUS "*** ARMA_USE_HDF5_ALT = ${ARMA_USE_HDF5_ALT}") +message(STATUS "*** ARMA_USE_HDF5_CMAKE = ${ARMA_USE_HDF5_CMAKE}") message(STATUS "*** ARMA_USE_ARPACK = ${ARMA_USE_ARPACK}") message(STATUS "*** ARMA_USE_EXTERN_RNG = ${ARMA_USE_EXTERN_RNG}") message(STATUS "*** ARMA_USE_SUPERLU = ${ARMA_USE_SUPERLU}") diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp index 5580a3d4..39b8e276 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -159,8 +159,8 @@ //// Comment out the above line if you don't want automatic checking for nonfinite matrices #endif -// #define ARMA_USE_HDF5_ALT -#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) +// #define ARMA_USE_HDF5_CMAKE +#if defined(ARMA_USE_HDF5_CMAKE) && defined(ARMA_USE_WRAPPER) #undef ARMA_USE_HDF5 #define ARMA_USE_HDF5 @@ -263,7 +263,7 @@ #if defined(ARMA_DONT_USE_WRAPPER) #undef ARMA_USE_WRAPPER - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #if defined(ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS) @@ -310,7 +310,7 @@ #if defined(ARMA_DONT_USE_HDF5) #undef ARMA_USE_HDF5 - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND) diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake index 8d449a8f..8c99b238 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -159,8 +159,8 @@ //// Comment out the above line if you don't want automatic checking for nonfinite matrices #endif -#cmakedefine ARMA_USE_HDF5_ALT -#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) +#cmakedefine ARMA_USE_HDF5_CMAKE +#if defined(ARMA_USE_HDF5_CMAKE) && defined(ARMA_USE_WRAPPER) #undef ARMA_USE_HDF5 #define ARMA_USE_HDF5 @@ -263,7 +263,7 @@ #if defined(ARMA_DONT_USE_WRAPPER) #undef ARMA_USE_WRAPPER - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #if defined(ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS) @@ -310,7 +310,7 @@ #if defined(ARMA_DONT_USE_HDF5) #undef ARMA_USE_HDF5 - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND) diff --git a/include/armadillo_bits/def_hdf5.hpp b/include/armadillo_bits/def_hdf5.hpp index f59c76a2..cb4c3f42 100644 --- a/include/armadillo_bits/def_hdf5.hpp +++ b/include/armadillo_bits/def_hdf5.hpp @@ -18,7 +18,7 @@ #if defined(ARMA_USE_HDF5) -#if !defined(ARMA_USE_HDF5_ALT) +#if !defined(ARMA_USE_HDF5_CMAKE) // macros needed if the wrapper run-time library is not being used diff --git a/include/armadillo_bits/include_hdf5.hpp b/include/armadillo_bits/include_hdf5.hpp index ffcf4190..8b5b5884 100644 --- a/include/armadillo_bits/include_hdf5.hpp +++ b/include/armadillo_bits/include_hdf5.hpp @@ -27,7 +27,7 @@ #include #else #undef ARMA_USE_HDF5 - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found") #endif #else @@ -48,7 +48,7 @@ #include ARMA_INCFILE_WRAP(ARMA_HDF5_HEADER) #else #undef ARMA_USE_HDF5 - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found") #endif #else @@ -63,7 +63,7 @@ #if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT) #pragma message ("WARNING: use of HDF5 disabled; incompatible configuration: H5_USE_16_API or H5_USE_16_API_DEFAULT") #undef ARMA_USE_HDF5 - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #endif diff --git a/src/wrapper1.cpp b/src/wrapper1.cpp index b9e5d4c6..3ad471ed 100644 --- a/src/wrapper1.cpp +++ b/src/wrapper1.cpp @@ -39,7 +39,7 @@ } #endif -#if defined(ARMA_USE_HDF5_ALT) +#if defined(ARMA_USE_HDF5_CMAKE) #undef H5_USE_110_API #define H5_USE_110_API @@ -48,7 +48,7 @@ #if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT) #pragma message ("WARNING: use of HDF5 disabled; incompatible configuration: H5_USE_16_API or H5_USE_16_API_DEFAULT") - #undef ARMA_USE_HDF5_ALT + #undef ARMA_USE_HDF5_CMAKE #endif #endif @@ -61,10 +61,10 @@ namespace arma #include "armadillo_bits/def_lapack.hpp" #include "armadillo_bits/def_arpack.hpp" #include "armadillo_bits/def_superlu.hpp" -// no need to include def_hdf5.hpp -- it only contains #defines for when ARMA_USE_HDF5_ALT is not defined. +// no need to include def_hdf5.hpp -- it only contains #defines for when ARMA_USE_HDF5_CMAKE is not defined. -#if defined(ARMA_USE_HDF5_ALT) +#if defined(ARMA_USE_HDF5_CMAKE) // Wrapper functions: arma::H5open() and arma::H5check_version() to hijack calls to H5open() and H5check_version() herr_t H5open() { @@ -1595,7 +1595,7 @@ extern "C" - #if defined(ARMA_USE_HDF5_ALT) + #if defined(ARMA_USE_HDF5_CMAKE) hid_t arma_H5Tcopy(hid_t dtype_id) {