diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-20 04:23:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 04:23:50 (GMT) |
| commit | 6d881fe7755298d1c92c86d153b4f8097b86c483 (patch) | |
| tree | 506a43eb1d14b81d68aada1d62c9e62f5909a9aa /m4 | |
| parent | 59343e893185ef59f9fd93fd715a33ea4e125d7e (diff) | |
| download | hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.zip hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.tar.gz hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.tar.bz2 | |
Unify cmake and cmake_ext_mod like develop (#2596)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/aclocal_cxx.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/m4/aclocal_cxx.m4 b/m4/aclocal_cxx.m4 index 662d260..1a24599 100644 --- a/m4/aclocal_cxx.m4 +++ b/m4/aclocal_cxx.m4 @@ -26,7 +26,7 @@ dnl have a [PAC] prefix. dnl Checking if C++ needs old style header files in includes AC_DEFUN([PAC_PROG_CXX_HEADERS],[ AC_MSG_CHECKING([if $CXX needs old style header files in includes]) - TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" + TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([no])], @@ -38,7 +38,7 @@ AC_DEFUN([PAC_PROG_CXX_HEADERS],[ dnl Checking if ++ can handle namespaces AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[ AC_MSG_CHECKING([if $CXX can handle namespaces]) - TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" + TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) @@ -49,7 +49,7 @@ AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[ dnl Checking if C++ supports std AC_DEFUN([PAC_PROG_CXX_STD],[ AC_MSG_CHECKING([if $CXX supports std]) - TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" + TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) @@ -60,7 +60,7 @@ AC_DEFUN([PAC_PROG_CXX_STD],[ dnl Checking if C++ has offsetof extension AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[ AC_MSG_CHECKING([if $CXX has offsetof extension]) - TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" + TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],[AC_MSG_RESULT([yes]) AC_DEFINE([CXX_HAVE_OFFSETOF], [1], [Define if C++ compiler recognizes offsetof])], @@ -70,7 +70,7 @@ AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[ dnl Checking if C++ can handle static cast AC_DEFUN([PAC_PROG_CXX_STATIC_CAST],[ AC_MSG_CHECKING([if $CXX can handle static cast]) - TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" + TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) |