Commit b239f13e authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'hdf5-silence-bogus-errors'

74b3ac46 boost: ignore warnings
32fa69f2 hdf5: don't let cdash mistake warnings for errors
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !55
parents adc82b74 74b3ac46
......@@ -25,6 +25,8 @@ add_external_project(boost
BUILD_COMMAND ./b2 ${boost_toolset} address-model=${am} linkflags="-headerpad_max_install_names" --build-dir=${boost_build_dir} ${boost_with_args}
INSTALL_COMMAND ./b2 ${boost_toolset} address-model=${am} linkflags="-headerpad_max_install_names" ${boost_with_args} install --prefix=${boost_install_dir}
BUILD_IN_SOURCE 1
LOG_BUILD 1
)
add_extra_cmake_args(
......
......@@ -12,4 +12,6 @@ add_external_project(
-DHDF5_ENABLE_SZIP_ENCODING:BOOL=TRUE
-DHDF5_BUILD_HL_LIB:BOOL=TRUE
-DHDF5_BUILD_WITH_INSTALL_NAME:BOOL=TRUE
LOG_BUILD 1
)
......@@ -25,6 +25,8 @@ add_external_project(boost
BUILD_COMMAND ./b2 ${boost_toolset} --build-dir=${boost_build_dir} address-model=${am} dll-path=${install_location}/lib ${boost_with_args}
INSTALL_COMMAND ./b2 ${boost_toolset} address-model=${am} ${boost_with_args} dll-path=${install_location}/lib install
BUILD_IN_SOURCE 1
LOG_BUILD 1
)
add_extra_cmake_args(
......
......@@ -35,6 +35,8 @@ if(MSVC)
BUILD_COMMAND b2 --build-dir=${boost_build_dir} toolset=${msvc_version} address-model=${am} ${boost_with_args}
INSTALL_COMMAND b2 toolset=${msvc_version} address-model=${am} ${boost_with_args} --prefix=${install_location} install
BUILD_IN_SOURCE 1
LOG_BUILD 1
)
else()
#ninja / mingw has been launched from a shell with the toolset properly specified
......@@ -44,6 +46,8 @@ else()
BUILD_COMMAND b2 --build-dir=${boost_build_dir} address-model=${am} ${boost_with_args}
INSTALL_COMMAND b2 address-model=${am} ${boost_with_args} --prefix=${install_location} install
BUILD_IN_SOURCE 1
LOG_BUILD 1
)
endif()
......
......@@ -9,6 +9,8 @@ add_external_project(
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=TRUE
-DHDF5_ENABLE_SZIP_ENCODING:BOOL=TRUE
-DHDF5_BUILD_HL_LIB:BOOL=TRUE
LOG_BUILD 1
)
if (MSVC)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment