Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Old cmake check fixed #10820

Merged
merged 4 commits into from
Mar 18, 2022
Merged

Old cmake check fixed #10820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e39d2b0
Old cmake check fixed
lasote Mar 18, 2022
991f768
version and settings
lasote Mar 18, 2022
6293166
13 not 7
lasote Mar 18, 2022
7d98e23
Skip catalyst test
lasote Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conans/__init__.py
View file
Open in desktop
Expand Up @@ -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'
4 changes: 3 additions & 1 deletion conans/client/generators/cmake_common.py
View file
Open in desktop
Expand Up @@ -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")
Expand Down
2 changes: 2 additions & 0 deletions conans/client/migrations_settings.py
View file
Open in desktop
Expand Up @@ -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
6 changes: 3 additions & 3 deletions conans/test/functional/build_helpers/autotools_apple_test.py
View file
Open in desktop
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions conans/test/functional/build_helpers/cmake_ios_cross_build_test.py
View file
Open in desktop
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
1 change: 1 addition & 0 deletions conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py
View file
Open in desktop
Expand Up @@ -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)
Expand Down