diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-10-30 23:41:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 23:41:38 (GMT) |
| commit | d8b7b3593b0727acade59ebddf4c749ea774ae2a (patch) | |
| tree | 2dd4766e641319aeb54a9720194776235140e05e | |
| parent | 747cecb069d8824c47453b712a2355786a583ced (diff) | |
| parent | de4ccdfd630cc1edfac9f9b82c20ad120340ed4b (diff) | |
| download | hdf5-d8b7b3593b0727acade59ebddf4c749ea774ae2a.zip hdf5-d8b7b3593b0727acade59ebddf4c749ea774ae2a.tar.gz hdf5-d8b7b3593b0727acade59ebddf4c749ea774ae2a.tar.bz2 | |
Merge pull request #68 from xantares/mingw2
CMake: Add an option to opt-out MSVC naming convention
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 4 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 1 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index eb0392e..74dd35b 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -143,8 +143,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype) endif () endif () - #----- Use MSVC Naming conventions for Shared Libraries - if (MINGW AND ${libtype} MATCHES "SHARED") + option (HDF5_MSVC_NAMING_CONVENTION "Use MSVC Naming conventions for Shared Libraries" OFF) + if (HDF5_MSVC_NAMING_CONVENTION AND MINGW AND ${libtype} MATCHES "SHARED") set_target_properties (${libtarget} PROPERTIES IMPORT_SUFFIX ".lib" IMPORT_PREFIX "" diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 0d35b3f..ed27bb2 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -777,6 +777,7 @@ HDF5_USE_FOLDERS "Enable folder grouping of projects in IDEs." HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON HDF5_ENABLE_THREADSAFE "Enable Threadsafety" OFF +HDF5_MSVC_NAMING_CONVENTION "Use MSVC Naming conventions for Shared Libraries" OFF if (APPLE) HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF if (CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index e3a1dd4..70af053 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -48,6 +48,13 @@ New Features Configuration: ------------- + - CMake option to use MSVC naming conventions with MinGW + + HDF5_MSVC_NAMING_CONVENTION option enable to use MSVC naming conventions + when using a MinGW toolchain + + (xan - 2020/10/30) + - CMake option to build the HDF filter plugins project as an external project The HDF filter plugins project is a collection of registered compression |