mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-02 20:04:27 +02:00
ci: trying to add MSVC 19.30 support
This commit is contained in:
22
.github/workflows/ci-conan.yml
vendored
22
.github/workflows/ci-conan.yml
vendored
@@ -39,38 +39,43 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- {
|
- {
|
||||||
name: "Windows MSVC 2019",
|
name: "Windows MSVC 19.29",
|
||||||
os: windows-latest,
|
os: windows-2019,
|
||||||
compiler: { type: VISUAL, version: 16, cc: "cl", cxx: "cl" }
|
compiler: { type: MSVC, version: 19.29, std: 20 }
|
||||||
|
}
|
||||||
|
- {
|
||||||
|
name: "Windows MSVC 19.30",
|
||||||
|
os: windows-2019,
|
||||||
|
compiler: { type: MSVC, version: 19.30, std: 23 }
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu GCC 10.3.0",
|
name: "Ubuntu GCC 10.3.0",
|
||||||
os: ubuntu-20.04,
|
os: ubuntu-20.04,
|
||||||
compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10" },
|
compiler: { type: GCC, version: 10, cc: "gcc-10", cxx: "g++-10", std: 20 },
|
||||||
lib: "libstdc++11"
|
lib: "libstdc++11"
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu GCC 11.1.0",
|
name: "Ubuntu GCC 11.1.0",
|
||||||
os: ubuntu-20.04,
|
os: ubuntu-20.04,
|
||||||
compiler: { type: GCC, version: 11, cc: "gcc-11", cxx: "g++-11" },
|
compiler: { type: GCC, version: 11, cc: "gcc-11", cxx: "g++-11", std: 20 },
|
||||||
lib: "libstdc++11"
|
lib: "libstdc++11"
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu Clang 12.0.0 + libstdc++11",
|
name: "Ubuntu Clang 12.0.0 + libstdc++11",
|
||||||
os: ubuntu-20.04,
|
os: ubuntu-20.04,
|
||||||
compiler: { type: CLANG, version: 12, cc: "clang-12", cxx: "clang++-12" },
|
compiler: { type: CLANG, version: 12, cc: "clang-12", cxx: "clang++-12", std: 20 },
|
||||||
lib: "libstdc++11"
|
lib: "libstdc++11"
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu Clang 12.0.0 + libc++",
|
name: "Ubuntu Clang 12.0.0 + libc++",
|
||||||
os: ubuntu-20.04,
|
os: ubuntu-20.04,
|
||||||
compiler: { type: CLANG, version: 12, cc: "clang-12", cxx: "clang++-12" },
|
compiler: { type: CLANG, version: 12, cc: "clang-12", cxx: "clang++-12", std: 20 },
|
||||||
lib: "libc++"
|
lib: "libc++"
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu Clang 13.0.0 + libc++",
|
name: "Ubuntu Clang 13.0.0 + libc++",
|
||||||
os: ubuntu-20.04,
|
os: ubuntu-20.04,
|
||||||
compiler: { type: CLANG, version: 13, cc: "clang-13", cxx: "clang++-13" },
|
compiler: { type: CLANG, version: 13, cc: "clang-13", cxx: "clang++-13", std: 20 },
|
||||||
lib: "libc++"
|
lib: "libc++"
|
||||||
}
|
}
|
||||||
# In case a Conan docker image will be needed to provide a specific configuration we can use a Docker image as follows
|
# In case a Conan docker image will be needed to provide a specific configuration we can use a Docker image as follows
|
||||||
@@ -136,6 +141,7 @@ jobs:
|
|||||||
if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then
|
if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then
|
||||||
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default
|
||||||
fi
|
fi
|
||||||
|
conan profile update settings.compiler.cppstd=${{ matrix.config.compiler.std }} default
|
||||||
conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default
|
conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default
|
||||||
conan profile show default
|
conan profile show default
|
||||||
# - name: Add support for clang-13 to Conan's settings.yml
|
# - name: Add support for clang-13 to Conan's settings.yml
|
||||||
|
1
build.py
1
build.py
@@ -44,6 +44,5 @@ if __name__ == "__main__":
|
|||||||
)
|
)
|
||||||
builder.add_common_builds(pure_c=True)
|
builder.add_common_builds(pure_c=True)
|
||||||
for settings, options, env_vars, build_requires, reference in builder.items:
|
for settings, options, env_vars, build_requires, reference in builder.items:
|
||||||
settings["compiler.cppstd"] = "20"
|
|
||||||
env_vars["mp-units:CONAN_RUN_TESTS"] = "True"
|
env_vars["mp-units:CONAN_RUN_TESTS"] = "True"
|
||||||
builder.run()
|
builder.run()
|
||||||
|
@@ -102,6 +102,9 @@ class UnitsConan(ConanFile):
|
|||||||
elif compiler == "Visual Studio":
|
elif compiler == "Visual Studio":
|
||||||
if version < "16":
|
if version < "16":
|
||||||
raise ConanInvalidConfiguration("mp-units requires at least Visual Studio 16.9")
|
raise ConanInvalidConfiguration("mp-units requires at least Visual Studio 16.9")
|
||||||
|
elif compiler == "msvc":
|
||||||
|
if version < "19.28":
|
||||||
|
raise ConanInvalidConfiguration("mp-units requires at least MSVC 19.28")
|
||||||
else:
|
else:
|
||||||
raise ConanInvalidConfiguration("Unsupported compiler")
|
raise ConanInvalidConfiguration("Unsupported compiler")
|
||||||
check_min_cppstd(self, "20")
|
check_min_cppstd(self, "20")
|
||||||
|
Reference in New Issue
Block a user