Standard as an option #2042

lasote · 2017-11-17T14:09:04Z

#1799 (part of #2033, but can be completed later)

CHANGED TO USE THE config_options METHOD, BUT AFFECTED BY #2108

Very similar to Standard as subsetting: NOT MERGE #2030 but using options instead.
Added new mechanism (to discuss) to add programmatically common options like "shared" or now the standard. def options(self, config) method instead of options attribute. Look at the tests.
Removed deprecated helpers
Added MSBuild() helper that uses VisualStudioBuildEnvironment and the tools to build a vs project.
I think this approach is cleaner, with fewer side effects and given that has not been a massive demanded feature, maybe it's reasonable to manage it as an option, only in the packages that declare it. To study (can be done later) if we want to add it somehow to the "conan new" templates.
VS14 not forced in test suite, working with 2017

…sets

codecov-io · 2017-11-20T09:24:50Z

Codecov Report

Merging #2042 into develop will decrease coverage by 1.72%.
The diff coverage is 86.73%.

@@             Coverage Diff             @@
##           develop    #2042      +/-   ##
===========================================
- Coverage    95.89%   94.16%   -1.73%     
===========================================
  Files          350      352       +2     
  Lines        28056    28121      +65     
===========================================
- Hits         26904    26481     -423     
- Misses        1152     1640     +488

…into feature/standard_as_option

memsharded · 2017-11-27T09:42:30Z

conans/client/build/compilers_info.py

+
+    v98 = v98gnu = v11 = v11gnu = v14 = v14gnu = v17 = v17gnu = None
+
+    if not float(clang_version) < 4.0:


Feels a bit hacky this comparison, not saying it doesnt work...

yeah, suggestions?

memsharded

Good job, generally I like it. Please see comments.

memsharded · 2017-11-27T10:05:33Z

conans/client/build/cmake.py

+        if self._cppstd:
+            if self._cppstd.endswith("gnu"):
+                ret["CONAN_CMAKE_CXX_STANDARD"] = self._cppstd[:-3]
+                ret["CONAN_CMAKE_CXX_EXTENSIONS"] = "ON"


Maybe CONAN_CMAKE_CXX_GNU_EXTENSIONS?

the variable in CMake is CMAKE_CXX_EXTENSIONS:

set(CMAKE_CXX_EXTENSIONS OFF) On some platforms, this results in linking to a different library (e.g. -std=c++11 rather than -std=gnu++11). The default behavior is for C++ extensions to be enabled.

memsharded · 2017-11-27T10:06:32Z

conans/client/build/visual_environment.py

+        if self.std:
+            ret.append(self.std)
+
+            ret.extend(['/D%s' % lib for lib in self.defines])


defines only if self.std?

memsharded · 2017-11-27T10:07:09Z

conans/client/build/visual_environment.py

+
+    def _get_cl_list(self, quotes=True):
+        if quotes:
+            ret = ['/I%s' % lib for lib in self.include_paths]


These two lines are identical

memsharded · 2017-11-27T10:08:38Z

conans/client/generators/cmake_common.py

@@ -234,6 +234,30 @@ def generate_targets_section(dependencies):
    endif()
 endmacro()

+macro(conan_set_std)
+  if (CMAKE_VERSION VERSION_LESS "3.1")
+    if(CONAN_STD_CXX_FLAG)


I don't fully get the CONAN_STD_CXX_FLAG and CONAN_CMAKE_CXX_STANDARD, I guess something Cmake-ish

CONAN_STD_CXX_FLAG: Only used in case the CMake < 3.1, it is directly the flag to pass to the compiler, because CMake < 3.1 do no support it another way. Includes the -std=XXXX. Conan uses the compilers_info.py to translate to the correct flag depending on each compiler/version.

CONAN_CMAKE_CXX_STANDARD: Used > 3.1. Do not include the -std=XXX is directly the value of the standard, 98, 11, 14, 17. Internally CMake will translate it to the -std=xxx taking also into account the CMAKE_CXX_EXTENSIONS to know if it should like with "gnu++11" or just "c++11".

memsharded · 2017-11-27T10:10:33Z

conans/model/conan_file.py

+    def add_shared(self, default=False):
+        self.options.add_option("shared", [True, False], default)
+
+    def add_cppstd(self, default=None):


This self.add_cppstd() default to 11 seems a bit weird to me.

Yes, better to keep it explicit and not optional.

Mhh, maybe it should be defaulted to the compiler's version default?

memsharded · 2017-11-27T10:20:38Z

conans/test/functional/autotools_configure_test.py

+                                 "compiler": "gcc",
+                                 "compiler.libcxx": "libstdc++11",
+                                 "compiler.version": "4.9"})
+        options = MockOptions({"cppstd": "17"})


I am wondering if this should be managed somehow. So you requested cppstd=17, which is impossible, it will be ignored, but it will affect the binary package ID? Maybe should it raise?

Probably shouldn't be a valid option if you used the "add_cppstd" and will raise because of it. (not in this case of Mock()).
Actually we miss information in the case of Visual Studio, where depending on the revision of the compiler the default standard can change. In visual 2015 rev3 the default is cpp14, and c++11 makes no sense, there is no flag to specify a lower one, but in previous revisions the default was c++11.

memsharded · 2017-11-27T10:21:28Z

conans/test/functional/autotools_configure_test.py

    def test_variables(self):
        # GCC 32
        settings = MockSettings({"build_type": "Release",
                                 "arch": "x86",
                                 "compiler": "gcc",
                                 "compiler.libcxx": "libstdc++"})
-        conanfile = MockConanfile(settings)
+        conanfile = MockConanfile(settings, MockOptions({}))


Maybe set a default in MockConanFile constructor

memsharded · 2017-11-27T10:22:10Z

conans/test/functional/cmake_test.py

        self.deps_cpp_info = namedtuple("deps_cpp_info", "sysroot")("/path/to/sysroot")
        self.output = TestBufferConanOutput()
        if shared is not None:
-            self.options = namedtuple("options", "shared")(shared)
+            self.options = Options(PackageOptions({"shared": ["True", "False"]}))
+            self.options.values = OptionsValues([("shared",  shared)])


self.options.shared = True

It's already assigned because of the default value, right? it's not needed to assign it.

memsharded · 2017-11-27T10:25:45Z

conans/test/options_in_requirements_test.py

-    default_options= "shared=False"
+
+    def options(self, config):
+        config.add_shared()


How does it looks to add other options than shared & standards when using the options() method?

config.options.add_option("flavour", ["choco", "strawberry", "orange"], "orange")
It has to be added to the docs, of course

memsharded · 2017-11-27T10:26:45Z

conans/test/util/tools_test.py

+        error = client.run('create Hello/1.2.1@lasote/stable -o Hello:cppstd=11 -s compiler="Visual Studio" -s '
+                           'compiler.version=14', ignore_error=True)
+        self.assertTrue(error)
+        client.save(files)


why save again?

not needed.

memsharded · 2017-11-27T10:50:40Z

I have a further question: how the default for a certain compiler differs from the selected one: So if I use -o Pkg:cppstd=c++11, and it happens that C++11 is the default for my current settings, then I will be creating another binary with a different package ID which happens to be the same.

…into feature/standard_as_option

lasote · 2018-02-21T17:18:53Z

Discarded PR in favor of #2486

lasote added 12 commits November 14, 2017 14:24

Toolset subsetting and not limited vcvars

d79d809

Toolsets in msbuild

c3d36cf

pass toolset

d1b2aa4

Fixed toolset param

b0ace55

Merge branch 'develop' of github.com:conan-io/conan into feature/tool…

a0c2902

…sets

Added more toolsets

8dfb149

Added test

0b31c82

WIP

1b670b3

wip, pending tests

a39c637

Merged develop

ef96b2a

Some tests

ede883d

Standard as an option, test ok

d82fc3e

lasote assigned memsharded Nov 17, 2017

lasote added 2 commits November 20, 2017 10:11

Force 98 to fail

eebae6b

Removed configure environment

f3e9a03

lasote added 7 commits November 20, 2017 15:54

MSBuild and tested std flag in Visual

bce65c8

Refactor visual environment

43f7d48

Generate default profile

19a01a2

Fixed tests

6c093dd

Merge branch 'feature/standard_as_option' of github.com:lasote/conan …

ff97c1b

…into feature/standard_as_option

fixing tests

7c885f7

visual 15 to test the std capabilities

f681466

lasote changed the title ~~WIP NOT MERGE: Standard as an option~~ Standard as an option Nov 20, 2017

lasote modified the milestones: 0.29, 0.30 Nov 20, 2017

lasote added 3 commits November 21, 2017 08:29

Fixed test

ab22af9

Merged develop

3fb30f3

Merge branch 'feature/standard_as_option' of github.com:lasote/conan …

bb876b4

…into feature/standard_as_option

lasote added 6 commits November 21, 2017 15:27

Try appveyor with 2017 image

54e61ba

Explicit visual 2017

a573668

CMake 3.7.2 appveyor

b17535f

Merge branch 'feature/standard_as_option' of github.com:lasote/conan …

4e4fc38

…into feature/standard_as_option

Recovered visual 15 for main testing

15183ca

Example of std using vs 2015

87772dc

memsharded reviewed Nov 27, 2017

View reviewed changes

lasote added 8 commits December 4, 2017 10:13

Merged with develop

4fcca50

Available standards depending on compiler, packageID for default one

5d2fb88

Available standards depending on compiler, packageID for default one

ca6d1d6

Merge branch 'feature/standard_as_option' of github.com:lasote/conan …

280f783

…into feature/standard_as_option

cmake ignore

ebcc53c

as config_options

d5f4e76

Fixed all except local flow

da3e572

Fixed test

8acf7f1

lasote modified the milestones: 0.30, 1.0 Dec 5, 2017

Updated with develop

a462c16

lasote modified the milestones: 1.0, 1.1 Dec 20, 2017

memsharded mentioned this pull request Dec 27, 2017

RocksDB/5.8 conan-io/wishlist#92

Closed

pvicente added the stage: review label Jan 31, 2018

memsharded mentioned this pull request Feb 6, 2018

Detect should show a warning about libcxx compatibility #2423

Closed

3 tasks

lasote mentioned this pull request Feb 14, 2018

Consider setting for C++ std #1799

Closed

lasote removed this from the 1.1 milestone Feb 20, 2018

lasote closed this Feb 21, 2018

ghost removed the stage: review label Feb 21, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Standard as an option #2042

Standard as an option #2042

lasote commented Nov 17, 2017 •

edited

Loading

codecov-io commented Nov 20, 2017 •

edited

Loading

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded left a comment

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded Nov 27, 2017

lasote Dec 4, 2017 •

edited

Loading

memsharded Nov 27, 2017

lasote Dec 4, 2017

memsharded commented Nov 27, 2017

lasote commented Feb 21, 2018


		v98 = v98gnu = v11 = v11gnu = v14 = v14gnu = v17 = v17gnu = None

		if not float(clang_version) < 4.0:

Standard as an option #2042

Standard as an option #2042

Conversation

lasote commented Nov 17, 2017 • edited Loading

codecov-io commented Nov 20, 2017 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

memsharded left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lasote Dec 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

memsharded commented Nov 27, 2017

lasote commented Feb 21, 2018

lasote commented Nov 17, 2017 •

edited

Loading

codecov-io commented Nov 20, 2017 •

edited

Loading

lasote Dec 4, 2017 •

edited

Loading