diff --git a/appveyor.yml b/appveyor.yml index 63c1f8d76..0fc77193f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,7 +70,7 @@ install: # Install CMake 3.9 ############################################################################ - - ps: Start-FileDownload 'http://portal.nersc.gov/project/visit/cmake/cmake-3.9.6-win64-x64.msi' + - ps: Start-FileDownload 'http://ascent-dav.org/mirror/cmake-3.9.6-win64-x64.msi' - cmake-3.9.6-win64-x64.msi /passive - set PATH=C:\Program Files\CMake\bin;%PATH% - cmake --version diff --git a/hashes.txt b/hashes.txt index 51fcafc85..f7a3ba3cd 100644 --- a/hashes.txt +++ b/hashes.txt @@ -1 +1 @@ -blt branch='develop' commit='aea5fbf046e122bd72888dad0a7f97a07b9ff08d' +blt branch='develop' commit='86a7d6b5ee93d8b7b3233a3e54a4f06f8d8308d3' diff --git a/src/blt b/src/blt index aea5fbf04..86a7d6b5e 160000 --- a/src/blt +++ b/src/blt @@ -1 +1 @@ -Subproject commit aea5fbf046e122bd72888dad0a7f97a07b9ff08d +Subproject commit 86a7d6b5ee93d8b7b3233a3e54a4f06f8d8308d3 diff --git a/src/cmake/Setup3rdParty.cmake b/src/cmake/Setup3rdParty.cmake index 65ed34958..46876bd96 100644 --- a/src/cmake/Setup3rdParty.cmake +++ b/src/cmake/Setup3rdParty.cmake @@ -151,26 +151,4 @@ if(H5ZZFP_DIR) endif() endif() -################################## -# Export BLT Targets when needed -################################## - -set(BLT_TPL_DEPS_EXPORTS) -# cmake < 3.15, we use BLT's mpi target and need to export -# it for use downstream -if( ${CMAKE_VERSION} VERSION_LESS "3.15.0" ) - blt_list_append(TO BLT_TPL_DEPS_EXPORTS ELEMENTS mpi IF ENABLE_MPI) -endif() - -foreach(dep ${BLT_TPL_DEPS_EXPORTS}) - # If the target is EXPORTABLE, add it to the export set - get_target_property(_is_imported ${dep} IMPORTED) - if(NOT ${_is_imported}) - install(TARGETS ${dep} - EXPORT conduit - DESTINATION lib) - # Namespace target to avoid conflicts - set_target_properties(${dep} PROPERTIES EXPORT_NAME conduit::blt_${dep}) - endif() -endforeach() diff --git a/src/cmake/SetupBLT.cmake b/src/cmake/SetupBLT.cmake index b6ab0f844..db84221d5 100644 --- a/src/cmake/SetupBLT.cmake +++ b/src/cmake/SetupBLT.cmake @@ -32,17 +32,14 @@ include(${BLT_SOURCE_DIR}/SetupBLT.cmake) if(ENABLE_MPI) # adjust MPI from BLT if( ${CMAKE_VERSION} VERSION_LESS "3.15.0" ) - # older cmake, we use BLT imported targets - # this is simply a target alias - blt_register_library(NAME conduit_blt_mpi_deps - LIBRARIES mpi) + # older cmake, we use BLT's mpi support, it uses + # the name mpi + set(conduit_blt_mpi_deps mpi CACHE STRING "") else() if(TARGET MPI::MPI_CXX) message(STATUS "Using MPI CMake imported target: MPI::MPI_CXX") - # newer cmake we use find mpi targets directly, - # this is simply a target alias - blt_register_library(NAME conduit_blt_mpi_deps - LIBRARIES MPI::MPI_CXX) + # newer cmake we use find mpi targets directly + set(conduit_blt_mpi_deps MPI::MPI_CXX CACHE STRING "") else() message(FATAL_ERROR "Cannot use CMake imported targets for MPI." "(CMake > 3.15, ENABLE_MPI == ON, but " diff --git a/src/cmake/SetupTests.cmake b/src/cmake/SetupTests.cmake index a2fa31159..52ac72b30 100644 --- a/src/cmake/SetupTests.cmake +++ b/src/cmake/SetupTests.cmake @@ -64,7 +64,7 @@ function(add_cpp_mpi_test) blt_add_executable( NAME ${args_TEST} SOURCES ${args_TEST}.cpp ${args_SOURCES} OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS_ON "${args_DEPENDS_ON}" gtest conduit_blt_mpi_deps) + DEPENDS_ON "${args_DEPENDS_ON}" gtest ${conduit_blt_mpi_deps}) blt_add_test( NAME ${args_TEST} COMMAND ${args_TEST} diff --git a/src/libs/blueprint/CMakeLists.txt b/src/libs/blueprint/CMakeLists.txt index 07304f04a..2d67210a3 100644 --- a/src/libs/blueprint/CMakeLists.txt +++ b/src/libs/blueprint/CMakeLists.txt @@ -170,7 +170,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/conduit_blueprint_exports.h) # Specify blueprint mpi deps # set(conduit_blueprint_mpi_deps conduit - conduit_blt_mpi_deps + ${conduit_blt_mpi_deps} conduit_blueprint conduit_relay_mpi) diff --git a/src/libs/relay/CMakeLists.txt b/src/libs/relay/CMakeLists.txt index 214e130d6..6a5599fed 100644 --- a/src/libs/relay/CMakeLists.txt +++ b/src/libs/relay/CMakeLists.txt @@ -171,7 +171,7 @@ endif() if(HDF5_FOUND) list(APPEND conduit_relay_deps hdf5) if(HDF5_IS_PARALLEL) - list(APPEND conduit_relay_deps conduit_blt_mpi_deps) + list(APPEND conduit_relay_deps ${conduit_blt_mpi_deps}) endif() endif() @@ -306,7 +306,7 @@ set(conduit_relay_mpi_sources conduit_relay_mpi.cpp) # Specify the relay mpi deps # set(conduit_relay_mpi_deps conduit - conduit_blt_mpi_deps) + ${conduit_blt_mpi_deps}) # # setup conduit relay mpi lib @@ -343,7 +343,7 @@ set(conduit_relay_mpi_io_headers conduit_relay_mpi_io.hpp) # Specify the relay mpi io deps # set(conduit_relay_mpi_io_deps conduit - conduit_blt_mpi_deps + ${conduit_blt_mpi_deps} conduit_relay_mpi conduit_relay) diff --git a/src/tests/thirdparty/CMakeLists.txt b/src/tests/thirdparty/CMakeLists.txt index 9ee97e7df..ee603ae18 100644 --- a/src/tests/thirdparty/CMakeLists.txt +++ b/src/tests/thirdparty/CMakeLists.txt @@ -62,7 +62,7 @@ endif() if(HDF5_FOUND) message(STATUS "HDF5 enabled: Adding related unit tests") if(HDF5_IS_PARALLEL) - set(HDF5_MPI_DEP conduit_blt_mpi_deps) + set(HDF5_MPI_DEP ${conduit_blt_mpi_deps}) endif() add_cpp_test(TEST t_hdf5_smoke DEPENDS_ON hdf5 ${HDF5_MPI_DEP} @@ -74,7 +74,7 @@ endif() if(SILO_FOUND) if(HDF5_FOUND AND HDF5_IS_PARALLEL) - set(SILO_HDF5_MPI_DEP conduit_blt_mpi_deps) + set(SILO_HDF5_MPI_DEP ${conduit_blt_mpi_deps}) endif() message(STATUS "Silo enabled: Adding related unit tests") add_cpp_test(TEST t_silo_smoke @@ -117,7 +117,7 @@ endif() if(H5ZZFP_FOUND) message(STATUS "h5z-zfp enabled: Adding related unit tests") if(HDF5_IS_PARALLEL) - set(H5ZZFP_MPI_DEP conduit_blt_mpi_deps) + set(H5ZZFP_MPI_DEP ${conduit_blt_mpi_deps}) endif() add_cpp_test(TEST t_h5z_zfp_smoke DEPENDS_ON h5zzfp zfp hdf5 ${H5ZZFP_MPI_DEP}