From 0a3f8239e65b9405634560bc5e648247748bcdfa Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 2 Jun 2017 11:44:51 -0500 Subject: Add toolset option --- config/cmake/HDF518_Examples.cmake.in | 4 ++-- config/cmake/HDF5_Examples.cmake.in | 4 ++-- config/cmake/hdf5-config.cmake.in | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 4f61563..6af0b09 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_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index 08456ce..d137b37 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_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 c54391f..904c083 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -44,6 +44,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 -- cgit v0.12