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.

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

Fix: set the default CMake generator and toolset for Intel C++ #6804

Merged
merged 1 commit into from Jun 2, 2020

Conversation

SSE4
Copy link
Contributor

@SSE4 SSE4 commented Apr 6, 2020

/cc @ohanar
related: #5699
based on ohanar@7a62f3a
tested locally with the following conan profile:

[settings]
arch=x86_64
arch_build=x86_64
os=Windows
os_build=Windows
compiler=intel
compiler.version=19.1
compiler.base=Visual Studio
compiler.base.version=16
compiler.base.runtime=MDd
build_type=Debug

(Intel C++ 19.1)

as result, conan sets correct CMake generator and toolset, and CMake successfully uses the right compiler:

log4cplus/2.0.4 (test package): Calling build()
-- The C compiler identification is Intel 19.1.0.20200306
-- The CXX compiler identification is Intel 19.1.0.20200306
-- Check for working C compiler: C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2020/windows/bin/intel64/icl.exe
-- Check for working C compiler: C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2020/windows/bin/intel64/icl.exe -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2020/windows/bin/intel64/icl.exe
-- Check for working CXX compiler: C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2020/windows/bin/intel64/icl.exe -- works

Changelog: Fix: Set the default CMake generator and toolset for Intel C++.
Docs: omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
danimtb
danimtb approved these changes May 6, 2020
@danimtb danimtb added this to the 1.26 milestone May 6, 2020
@danimtb danimtb self-assigned this May 6, 2020
@danimtb
Copy link
Member

@danimtb danimtb commented May 6, 2020

@SSE4 please solve conflicts here

Signed-off-by: SSE4 <tomskside@gmail.com>
@danimtb danimtb assigned memsharded and unassigned danimtb May 13, 2020
@memsharded memsharded merged commit a7210b5 into conan-io:develop Jun 2, 2020
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants