diff --git a/conans/__init__.py b/conans/__init__.py index 8d4a32c3500..d5d1c4f9a75 100644 --- a/conans/__init__.py +++ b/conans/__init__.py @@ -20,4 +20,4 @@ SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, REVISIONS] # Server is always with revisions DEFAULT_REVISION_V1 = "0" -__version__ = '1.46.1' +__version__ = '1.46.2' diff --git a/conans/client/generators/cmake_common.py b/conans/client/generators/cmake_common.py index b0425fbac78..06d0d22941e 100644 --- a/conans/client/generators/cmake_common.py +++ b/conans/client/generators/cmake_common.py @@ -528,7 +528,9 @@ class CMakeCommonMacros: endif() elseif(CONAN_COMPILER STREQUAL "apple-clang" OR CONAN_COMPILER STREQUAL "sun-cc" OR CONAN_COMPILER STREQUAL "mcst-lcc") conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR) - if(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR}) + if(${CONAN_COMPILER_MAJOR} VERSION_GREATER_EQUAL "13" AND "${CONAN_COMPILER_MINOR}" STREQUAL "" AND ${CONAN_COMPILER_MAJOR} VERSION_EQUAL ${VERSION_MAJOR}) + # This is correct, 13.X is considered 13 + elseif(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR}) conan_error_compiler_version() endif() elseif(CONAN_COMPILER STREQUAL "intel") diff --git a/conans/client/migrations_settings.py b/conans/client/migrations_settings.py index eeb946fa580..eff73186f2e 100644 --- a/conans/client/migrations_settings.py +++ b/conans/client/migrations_settings.py @@ -3399,3 +3399,5 @@ cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd """ + +settings_1_46_2 = settings_1_46_1 diff --git a/conans/test/functional/build_helpers/autotools_apple_test.py b/conans/test/functional/build_helpers/autotools_apple_test.py index 8654a622752..6f1045602dc 100644 --- a/conans/test/functional/build_helpers/autotools_apple_test.py +++ b/conans/test/functional/build_helpers/autotools_apple_test.py @@ -81,14 +81,14 @@ def test_makefile_arch(self, arch, os_, os_version): self.t.run_command('lipo -info "%s"' % app) self.assertIn("architecture: %s" % expected_arch, self.t.out) - @parameterized.expand([("x86_64",), - ("armv8",)]) + @parameterized.expand([("x86_64",), ("armv8",)]) + @pytest.mark.xfail(reason="Disabled until fix apple-clang 13.1 and --target value for catalyst") def test_catalyst(self, arch): profile = textwrap.dedent(""" include(default) [settings] os = Macos - os.version = 13.0 + os.version = 12.0 os.sdk = macosx os.subsystem = catalyst arch = {arch} diff --git a/conans/test/functional/build_helpers/cmake_ios_cross_build_test.py b/conans/test/functional/build_helpers/cmake_ios_cross_build_test.py index 69e355c9bb8..a5fe70b080f 100644 --- a/conans/test/functional/build_helpers/cmake_ios_cross_build_test.py +++ b/conans/test/functional/build_helpers/cmake_ios_cross_build_test.py @@ -15,7 +15,7 @@ def test_cross_build_test_package(): os=Macos arch=x86_64 compiler=apple-clang - compiler.version=13.0 + compiler.version=13 compiler.libcxx=libc++ build_type=Release [options] @@ -29,7 +29,7 @@ def test_cross_build_test_package(): os.version=13.0 arch=x86_64 compiler=apple-clang - compiler.version=13.0 + compiler.version=13 compiler.libcxx=libc++ build_type=Release [options] diff --git a/conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py b/conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py index 46c4b610a6d..ae7adc4c8d1 100644 --- a/conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py +++ b/conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py @@ -80,6 +80,7 @@ def test_makefile_arch(config): @pytest.mark.skipif(platform.system() != "Darwin", reason="Only OSX") @pytest.mark.parametrize("arch", ["x86_64", "armv8"]) +@pytest.mark.xfail(reason="Disabled until fix apple-clang 13.1 and --target value for catalyst") def test_catalyst(arch): profile = textwrap.dedent(""" include(default)