d77a8f7aa1
* Sensei: Refactor package to work with v4.0.0 * Add missing MPI dependency * Patch bug in libsim adapter * Simplify conflicts with when-clauses * Conflict variants that are incompatible (catalyst/libsim/ascent) * Fix paraview version constraints to be more clear * Add version constraints for VTK * Drop unneeded visit restrictions * Specify +vtkm dependency on ParaView's VTKm * +hl is not needed for VTK, and is already specified in the VTK recipe when it is needed * Pass paths for adios2 and ascent packages * ECP-SDK: Enable sensei * CI: Add sensei to the data-vis-sdk pipeline * Sensei: Change VISIT_DIR to work on linux * Fixup: style check * Sensei: Add patch for version detection * CI: revert SDK pipeline in favor of new matrices * Sensei: Formatting fixes
24 lines
782 B
Diff
24 lines
782 B
Diff
diff --git a/CMake/version.cmake b/CMake/version.cmake
|
|
index ea171ade..f2b85e76 100644
|
|
--- a/CMake/version.cmake
|
|
+++ b/CMake/version.cmake
|
|
@@ -1,12 +1,14 @@
|
|
set(tmp)
|
|
find_package(Git QUIET)
|
|
if(GIT_FOUND)
|
|
- execute_process(COMMAND ${GIT_EXECUTABLE}
|
|
- --git-dir=${CMAKE_SOURCE_DIR}/.git describe --tags
|
|
- OUTPUT_VARIABLE tmp OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
+ execute_process(COMMAND ${GIT_EXECUTABLE}
|
|
+ --git-dir=${CMAKE_SOURCE_DIR}/.git describe --tags
|
|
+ OUTPUT_VARIABLE tmp OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
endif()
|
|
if(NOT tmp)
|
|
- set(tmp "v0.0.0")
|
|
+ # Set this to the latest released version.
|
|
+ # This version is used when using release tarballs
|
|
+ set(tmp "v4.0.0")
|
|
endif()
|
|
set(SENSEI_VERSION ${tmp} CACHE STRING "SENSEI version" FORCE)
|
|
|