Fix typo where fPIC option is not templated, so it is always enabled #9752
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
jwillikers
force-pushed
the
feature/fix-cmaketoolchain-fpic
branch
from
a68c28e to
3cdce8d
Compare
jwillikers
force-pushed
the
feature/fix-cmaketoolchain-fpic
branch
from
1e3ae3d to
1972453
Compare
memsharded
approved these changes
Oct 6, 2021
There was a problem hiding this comment.
This is great, thank you.
The unfortunate thing is that there was a test covering that, but passed because it was testing the empty string, which happen to match the blank space...
We probably want to add this to a potential 1.41.1 if it happens, I will assign to it, and we will see (otherwise 1.42)
|
I just added some unit tests, should I fix the original test? I'm not quite sure where it would be. |
|
Beware that one test is broken as it outputs Check the broken tests in https://ci.conan.io/blue/organizations/jenkins/ConanTestSuite/detail/PR-9752/4/pipeline/36 |
memsharded
approved these changes
Oct 6, 2021
memsharded
approved these changes
Oct 6, 2021
This reverts commit 7eebbde.
|
@memsharded Need anything else for this? |
|
Merging it, to be released in Conan 1.42. If there is an earlier 1.41.1, I'll backport it, but at the moment, it is not expected. Thanks very much for contributing this! |
memsharded
pushed a commit
to memsharded/conan
that referenced
this pull request
Oct 22, 2021
…onan-io#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.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Bugfix: The CMakeToolchain generator always sets fPIC enabled due to a typo where the actual parameter is not templated but instead hard-coded as
ON.Docs: Omit
developbranch, documenting this one. (N/A)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.
Fixes #9753