diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a11f4ce5c1154474d34d6797e8c67c99b202caf..f46b19390e4f95789bce763362812f2e191c8f5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ cmake_minimum_required(VERSION 3.19) project( scord - VERSION 0.3.1 + VERSION 0.3.3 LANGUAGES C CXX ) diff --git a/cmake/FindSlurm.cmake b/cmake/FindSlurm.cmake index 4a17249b489c990981463b8bb9e5e80cebb067bf..a46ff088e88ec1c90e4db361c31e32e8f3fd0cc0 100644 --- a/cmake/FindSlurm.cmake +++ b/cmake/FindSlurm.cmake @@ -68,32 +68,27 @@ The following cache variables may also be set: The path to the Slurm library. #]=======================================================================] +find_package(PkgConfig) +pkg_check_modules(PC_SLURM QUIET SLURM) find_path( SLURM_INCLUDE_DIR NAMES slurm/slurm.h - PATHS - ENV SLURM - ENV SLURM_PATH + PATHS ENV SLURM_ROOT - ENV CPATH - ENV C_INCLUDE_PATH - ENV CPLUS_INCLUDE_PATH + "/opt/slurm" PATH_SUFFIXES include ) find_library(SLURM_LIBRARY NAMES slurm -PATHS - ENV SLURM - ENV SLURM_PATH - ENV SLURM_ROOT + +PATHS + ENV SLURM_ROOT ENV LD_LIBRARY_PATH - ENV LIBRARY_PATH - ENV PATH + "/opt/slurm" PATH_SUFFIXES "lib" "lib64" - ) mark_as_advanced(SLURM_INCLUDE_DIR SLURM_LIBRARY) diff --git a/spack/packages/scord/package.py b/spack/packages/scord/package.py index c9a95b4cf8822121ef5b57d5da41d77eade2655c..f75f70274f9e4e777debd3d58a8810599abf733c 100644 --- a/spack/packages/scord/package.py +++ b/spack/packages/scord/package.py @@ -92,10 +92,6 @@ class Scord(CMakePackage): depends_on("cargo@0.3.2:", when='@0.3.1:') depends_on("slurm", when='@0.3.1:') -# slurm: -# externals: -# - spec: "slurm@23.02.6" -# prefix: "opt/slurm-23.02.6/" with when("@0.2.0: +ofi"): depends_on("libfabric@1.14.0 fabrics=sockets,tcp,rxm")