Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion repos/spack_repo/builtin/build_systems/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,9 @@ class CMakePackage(PackageBase):
# must conflict.
# this should be updated to reflect a oneapi fortran provider
# once oneapi is usable with fortran on Windows
conflicts("cmake@:4.0", when="%cxx=msvc %fortran=msvc")
# NOTE: commented out for now because cmake@3 is used in Spack CI
# successfully with %fortran=msvc.
# depends_on("cmake@4.1:", type="build", when="%cxx=msvc %fortran=msvc")

def flags_to_build_system_args(self, flags):
"""Return a list of all command line arguments to pass the specified
Expand Down
2 changes: 1 addition & 1 deletion repos/spack_repo/builtin/packages/curl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class Curl(NMakePackage, AutotoolsPackage, CMakePackage):

# CMake 4.0: is not compatible with CMake systems requiring
# 3.0, which curl@7.63 requires
depends_on("cmake@:3", when="build_system=cmake @:7.63")
depends_on("cmake@:3", type="build", when="build_system=cmake @:7.63")

depends_on("gnutls@3.6.5:", when="tls=gnutls @8.18:")
depends_on("gnutls", when="tls=gnutls")
Expand Down
2 changes: 1 addition & 1 deletion repos/spack_repo/builtin/packages/libuv/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def url_for_version(self, version):
with when("build_system=cmake"):
# explicitly require ownlibs to indicate we're short
# circuiting the cmake<->libuv cyclic dependency here
depends_on("cmake+ownlibs")
depends_on("cmake+ownlibs", type="build")

conflicts(
"%gcc@:4.8",
Expand Down
4 changes: 2 additions & 2 deletions repos/spack_repo/builtin/packages/scitokens_cpp/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class ScitokensCpp(CMakePackage):

depends_on("cxx", type="build") # generated

depends_on("cmake@2.6:")
depends_on("cmake@3.10:", when="@0.7.1:")
depends_on("cmake@2.6:", type="build")
depends_on("cmake@3.10:", type="build", when="@0.7.1:")
depends_on("openssl")
depends_on("sqlite")
depends_on("curl")
Expand Down
Loading