summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-06-02 16:49:30 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-06-02 16:49:30 (GMT)
commit0fab1032f93d8a245f56b2dc7c9b412bf88eea01 (patch)
tree166bb1528864c71696eec16eab2eea4c042eba70 /config
parentd354804d27a360b9f6a4a32b88e4d573b0bd9835 (diff)
downloadhdf5-0fab1032f93d8a245f56b2dc7c9b412bf88eea01.zip
hdf5-0fab1032f93d8a245f56b2dc7c9b412bf88eea01.tar.gz
hdf5-0fab1032f93d8a245f56b2dc7c9b412bf88eea01.tar.bz2
Add toolset option
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDF518_Examples.cmake.in4
-rw-r--r--config/cmake/hdf5-config.cmake.in1
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