add conduit 0.8.5 release and caliper variant (#34669)
This commit is contained in:
		| @@ -43,6 +43,7 @@ class Conduit(CMakePackage): | |||||||
|     # is to bridge any spack dependencies that are still using the name master |     # is to bridge any spack dependencies that are still using the name master | ||||||
|     version("master", branch="develop", submodules=True) |     version("master", branch="develop", submodules=True) | ||||||
|     # note: 2021-05-05 latest tagged release is now preferred instead of develop |     # note: 2021-05-05 latest tagged release is now preferred instead of develop | ||||||
|  |     version("0.8.5", sha256="b4a6f269a81570a4597e2565927fd0ed2ac45da0a2500ce5a71c26f7c92c5483") | ||||||
|     version("0.8.4", sha256="55c37ddc668dbc45d43b60c440192f76e688a530d64f9fe1a9c7fdad8cd525fd") |     version("0.8.4", sha256="55c37ddc668dbc45d43b60c440192f76e688a530d64f9fe1a9c7fdad8cd525fd") | ||||||
|     version("0.8.3", sha256="a9e60945366f3b8c37ee6a19f62d79a8d5888be7e230eabc31af2f837283ed1a") |     version("0.8.3", sha256="a9e60945366f3b8c37ee6a19f62d79a8d5888be7e230eabc31af2f837283ed1a") | ||||||
|     version("0.8.2", sha256="928eb8496bc50f6d8404f5bfa70220250876645d68d4f35ce0b99ecb85546284") |     version("0.8.2", sha256="928eb8496bc50f6d8404f5bfa70220250876645d68d4f35ce0b99ecb85546284") | ||||||
| @@ -101,6 +102,8 @@ class Conduit(CMakePackage): | |||||||
|     # doxygen support is wip, since doxygen has several dependencies |     # doxygen support is wip, since doxygen has several dependencies | ||||||
|     # we want folks to explicitly opt in to building doxygen |     # we want folks to explicitly opt in to building doxygen | ||||||
|     variant("doxygen", default=False, description="Build Conduit's Doxygen documentation") |     variant("doxygen", default=False, description="Build Conduit's Doxygen documentation") | ||||||
|  |     # caliper | ||||||
|  |     variant("caliper", default=False, description="Build Conduit Caliper support") | ||||||
| 
 | 
 | ||||||
|     ########################################################################### |     ########################################################################### | ||||||
|     # package dependencies |     # package dependencies | ||||||
| @@ -166,6 +169,11 @@ class Conduit(CMakePackage): | |||||||
|     ####################### |     ####################### | ||||||
|     depends_on("mpi", when="+mpi") |     depends_on("mpi", when="+mpi") | ||||||
| 
 | 
 | ||||||
|  |     ####################### | ||||||
|  |     # Caliper | ||||||
|  |     ####################### | ||||||
|  |     depends_on("caliper", when="+caliper") | ||||||
|  | 
 | ||||||
|     ####################### |     ####################### | ||||||
|     # Documentation related |     # Documentation related | ||||||
|     ####################### |     ####################### | ||||||
| @@ -507,6 +515,16 @@ def hostconfig(self): | |||||||
|         else: |         else: | ||||||
|             cfg.write("# zfp not built by spack \n") |             cfg.write("# zfp not built by spack \n") | ||||||
| 
 | 
 | ||||||
|  |         ####################### | ||||||
|  |         # Caliper | ||||||
|  |         ####################### | ||||||
|  |         cfg.write("# caliper from spack \n") | ||||||
|  |         if "+caliper" in spec: | ||||||
|  |             cfg.write(cmake_cache_entry("CALIPER_DIR", spec["caliper"].prefix)) | ||||||
|  |             cfg.write(cmake_cache_entry("ADIAK_DIR", spec["adiak"].prefix)) | ||||||
|  |         else: | ||||||
|  |             cfg.write("# caliper not built by spack \n") | ||||||
|  | 
 | ||||||
|         ####################################################################### |         ####################################################################### | ||||||
|         # I/O Packages |         # I/O Packages | ||||||
|         ####################################################################### |         ####################################################################### | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Cyrus Harrison
					Cyrus Harrison