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

All references to cpp_info.cppflags are being changed to cxxflags #1091

Merged
merged 2 commits into from Feb 27, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions integrations/other.rst
Expand Up @@ -180,7 +180,7 @@ and much more reusable to create a generator to simplify the task for your build
print(self.deps_cpp_info.libs)
print(self.deps_cpp_info.defines)
print(self.deps_cpp_info.cflags)
print(self.deps_cpp_info.cppflags)
print(self.deps_cpp_info.cxxflags)
print(self.deps_cpp_info.sharedlinkflags)
print(self.deps_cpp_info.exelinkflags)

Expand All @@ -192,7 +192,7 @@ and much more reusable to create a generator to simplify the task for your build
print(self.deps_cpp_info["OpenSSL"].libs)
print(self.deps_cpp_info["OpenSSL"].defines)
print(self.deps_cpp_info["OpenSSL"].cflags)
print(self.deps_cpp_info["OpenSSL"].cppflags)
print(self.deps_cpp_info["OpenSSL"].cxxflags)
print(self.deps_cpp_info["OpenSSL"].sharedlinkflags)
print(self.deps_cpp_info["OpenSSL"].exelinkflags)

Expand All @@ -204,7 +204,7 @@ and much more reusable to create a generator to simplify the task for your build
print(self.deps_cpp_info["Poco"].libs)
print(self.deps_cpp_info["Poco"].defines)
print(self.deps_cpp_info["Poco"].cflags)
print(self.deps_cpp_info["Poco"].cppflags)
print(self.deps_cpp_info["Poco"].cxxflags)
print(self.deps_cpp_info["Poco"].sharedlinkflags)
print(self.deps_cpp_info["Poco"].exelinkflags)

Expand Down
2 changes: 1 addition & 1 deletion reference/build_helpers/visual_studio.rst
Expand Up @@ -262,7 +262,7 @@ List with flags from requirements' ``cpp_info.cflags``.
cxx_flags
+++++++++

List with cxx flags from requirements' ``cpp_info.cppflags``.
List with cxx flags from requirements' ``cpp_info.cxxflags``.

link_flags
++++++++++
Expand Down
2 changes: 1 addition & 1 deletion reference/conanfile/attributes.rst
Expand Up @@ -817,7 +817,7 @@ This object should be filled in ``package_info()`` method.
+--------------------------------+---------------------------------------------------------------------------------------------------------+
| self.cpp_info.cflags | Ordered list with pure C flags. Defaulted to ``[]`` (empty) |
+--------------------------------+---------------------------------------------------------------------------------------------------------+
| self.cpp_info.cppflags | Ordered list with C++ flags. Defaulted to ``[]`` (empty) |
| self.cpp_info.cxxflags | Ordered list with C++ flags. Defaulted to ``[]`` (empty) |
jgsogo marked this conversation as resolved.
Show resolved Hide resolved
+--------------------------------+---------------------------------------------------------------------------------------------------------+
| self.cpp_info.sharedlinkflags | Ordered list with linker flags (shared libs). Defaulted to ``[]`` (empty) |
+--------------------------------+---------------------------------------------------------------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions reference/conanfile/methods.rst
Expand Up @@ -209,7 +209,7 @@ The ``cpp_info`` attribute has the following properties you can assign/append to
self.cpp_info.srcdirs = [] # Directories where sources can be found (debugging, reusing sources)
self.cpp_info.defines = [] # preprocessor definitions
self.cpp_info.cflags = [] # pure C flags
self.cpp_info.cppflags = [] # C++ compilation flags
self.cpp_info.cxxflags = [] # C++ compilation flags
self.cpp_info.sharedlinkflags = [] # linker flags
self.cpp_info.exelinkflags = [] # linker flags

Expand Down Expand Up @@ -237,7 +237,7 @@ The ``cpp_info`` attribute has the following properties you can assign/append to
them in other packages too).
- **defines**: Ordered list of preprocessor directives. It is common that the consumers have to specify some sort of defines in some cases,
so that including the library headers matches the binaries:
- **cflags**, **cppflags**, **sharedlinkflags**, **exelinkflags**: List of flags that the consumer should activate for proper behavior.
- **cflags**, **cxxflags**, **sharedlinkflags**, **exelinkflags**: List of flags that the consumer should activate for proper behavior.
Usage of C++11 could be configured here, for example, although it is true that the consumer may want to do some flag processing to check
if different dependencies are setting incompatible flags (c++11 after c++14).

Expand All @@ -249,7 +249,7 @@ The ``cpp_info`` attribute has the following properties you can assign/append to
self.cpp_info.defines = ["ZMQ_STATIC"]

if not self.settings.os == "Windows":
self.cpp_info.cppflags = ["-pthread"]
self.cpp_info.cxxflags = ["-pthread"]

Note that due to the way that some build systems, like CMake, manage forward and back slashes, it might
be more robust passing flags for Visual Studio compiler with dash instead. Using ``"/NODEFAULTLIB:MSVCRT"``,
Expand Down
2 changes: 1 addition & 1 deletion reference/generators/compiler_args.rst
Expand Up @@ -66,7 +66,7 @@ You can use the **compiler_args** generator directly to build simple programs:
+--------------------------------+----------------------------------------------------------------------+
| -D_GLIBCXX_USE_CXX11_ABI=1 | When setting libcxx == "libstdc++11" |
+--------------------------------+----------------------------------------------------------------------+
| Other flags | cppflags, cflags, sharedlinkflags, exelinkflags (applied directly) |
| Other flags | cxxflags, cflags, sharedlinkflags, exelinkflags (applied directly) |
+--------------------------------+----------------------------------------------------------------------+


Expand Down
4 changes: 2 additions & 2 deletions reference/generators/make.rst
Expand Up @@ -81,7 +81,7 @@ according to the dependency tree.

.. important::

Note that the mapping of the Conan variables to the Make ones is done taking the following rules into account and we suggest to use the
Note that the mapping of the Conan variables to the Make ones is done taking the following rules and we suggest to use the
variables indicated under the *Makefile* column to apply to a common naming:

+--------------+----------------------+------------+
Expand All @@ -97,5 +97,5 @@ according to the dependency tree.
+--------------+----------------------+------------+
| cflags | CONAN_CFLAGS | CFLAGS |
+--------------+----------------------+------------+
| cppflags | CONAN_CXXFLAGS | CXXFLAGS |
| cxxflags | CONAN_CXXFLAGS | CXXFLAGS |
+--------------+----------------------+------------+