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 unsafe check of the compiler in the CMakeToolchain generator #9801

Merged
merged 1 commit into from
Oct 14, 2021

Conversation

jwillikers
Copy link
Contributor

@jwillikers jwillikers commented Oct 14, 2021

Changelog: Bugfix: Avoid crash in CMakeToolchain for custom generator when compiler is not defined.
Docs: Omit

The compiler variable here must not be a NoneType object to use in.
This will result in an error when attempting to package a header-only library.
This commit fixes this check.
It first verifies the compiler is not None before checking it.

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.

The compiler variable here must not be a NoneType object to use `in`.
This will result in an error when attempting to package a header-only library.
This commit fixes this check.
It first verifies the compiler is not None before checking it.
@memsharded memsharded added this to the 1.42 milestone Oct 14, 2021
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this!
In general it would require a test, unit, integration, something to cover the bug and fix. But in this case as this crash is pretty obvious, we can move it foward.

@memsharded memsharded merged commit 9e50814 into conan-io:develop Oct 14, 2021
memsharded pushed a commit to memsharded/conan that referenced this pull request Oct 22, 2021
…an-io#9801)

The compiler variable here must not be a NoneType object to use `in`.
This will result in an error when attempting to package a header-only library.
This commit fixes this check.
It first verifies the compiler is not None before checking it.
memsharded added a commit that referenced this pull request Oct 25, 2021
…st profile and win_bash (#9755)

* tests that prove bad behavior

* wip

* workaround for win_bash for .bat files

* wip

* wip

* removed printing traceback

* fixing tests

* fixing tests

* fix test

* try fix py27

* wip

* wip

* Update conan/tools/env/environment.py

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>

* Update conan/tools/microsoft/subsystems.py

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>

* Fix unsafe check of the compiler in the CMakeToolchain generator (#9801)

The compiler variable here must not be a NoneType object to use `in`.
This will result in an error when attempting to package a header-only library.
This commit fixes this check.
It first verifies the compiler is not None before checking it.

* Fix typo where fPIC option is not templated, so it is always enabled (#9752)

* Fix typo where fPIC option is not templated, so it is always enabled

* Fix typo where fPIC option is not templated, so it is always enabled

* Add name to contributors

* Don't add fPIC functionality when it is not set

* Add unit tests

* Remove extra newlines

* Use "ON" and "OFF" for fPIC value in CMake

* Fix typos

* Correctly setup options for ConanFile Mocks

* Add missing fixture annotations

* Initialize options and default options dictionaries and fix Windows test

* Properly check if the OS is Windows

* Fix more typos

* Make sure to set OS as Windows for unit test ConanFiles

* Revert "Properly check if the OS is Windows"

This reverts commit 7eebbde.

* rename ConanFileInterface.new_cpp_info (#9800)

* rename ConanFileInterface.new_cpp_info

* wip

* wip

* fix policy=never (#9817)

* Feature: create alias targets (#8533)

* - CMakeDeps: add cmake_target_aliases property

Signed-off-by: SSE4 <tomskside@gmail.com>

* - automatically deduce an alias target

Signed-off-by: SSE4 <tomskside@gmail.com>

* Update conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>

* Update conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>

* - add comment

Signed-off-by: SSE4 <tomskside@gmail.com>

* - use cpp_info instead of new_cpp_info

Signed-off-by: SSE4 <tomskside@gmail.com>

* - remove useless checks

Signed-off-by: SSE4 <tomskside@gmail.com>

* - show a warning if target already exists

Signed-off-by: SSE4 <tomskside@gmail.com>

* - test case for cmake_target_name/cmake_target_namespace

Signed-off-by: SSE4 <tomskside@gmail.com>

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>

* Fix pkgconfig tests for Windows (#9833)

* Fixed all the tests in Windows

* Added mingw32-g++ tool for Windows

* Get rid of mingw32-g++ specific tool

* Changed appending symbol to overwriting one

* renaming to scope

* more scopes

* fix test

* Update conans/test/integration/toolchains/env/test_virtualenv_winbash.py

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
Co-authored-by: SSE4 <tomskside@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
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.

2 participants