diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-06-02 17:47:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-06-02 17:47:01 (GMT) |
| commit | 0716e65d057471f05cd411aa5b2bef0bae8e5234 (patch) | |
| tree | b63ae242f1395c36fac920623d90bdebd11c51a7 | |
| parent | 6f6c393e0966a472b60c8175b76858de653032c1 (diff) | |
| parent | 37ec0c2a24bd72dd5015cb5bd3cc3cdca67c8505 (diff) | |
| download | hdf5-0716e65d057471f05cd411aa5b2bef0bae8e5234.zip hdf5-0716e65d057471f05cd411aa5b2bef0bae8e5234.tar.gz hdf5-0716e65d057471f05cd411aa5b2bef0bae8e5234.tar.bz2 | |
Merge pull request #560 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '37ec0c2a24bd72dd5015cb5bd3cc3cdca67c8505':
Add toolset option
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 4 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 0f23598..6214b9f 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -17,8 +17,8 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR) ############################################################################################################### set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") -if() - set(CMAKE_GENERATOR_TOOLSET "@GENERATOR_TOOLSET@" +if("@CMAKE_GENERATOR_TOOLSET@") + set(CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") endif() set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY}) diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index 35411ea..7fe71e8 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -43,6 +43,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@) set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@) set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@) +set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") #----------------------------------------------------------------------------- # Dependencies |