Mxx_ru 1.6.14.2 → 1.6.14.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mxx_ru/cpp/toolset.rb +12 -0
- data/lib/mxx_ru/cpp/toolsets/clang_family.rb +3 -1
- data/lib/mxx_ru/cpp/toolsets/gcc_family.rb +3 -1
- data/lib/mxx_ru/cpp/toolsets/vc15.rb +3 -1
- data/lib/mxx_ru/version.rb +1 -1
- data/tests/cpp/lib_from_lib_dependecies/a.cpp +3 -0
- data/tests/unix/lib_linking_mode/o/main_conflict.o +0 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3e02f89caeda0a895a99b72d8255b9b3f39487a4
|
4
|
+
data.tar.gz: eeea13cbe2bb91e79f47b01bee7e09453f7847fe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 93abbfec4cd62ac29e0fd6e44be7b68e2a200a93efc5fdb24656f3ceea391a4233d6c7a77d4020491dd824a3a0226fa0ffa473448302f7c672c442c24f35eaf1
|
7
|
+
data.tar.gz: ba22e9daa0cbc664e9b9dea12b3601d6c1f0c09567b710f3b1454a88e631841a8f472a062fb5b23a86fe4e8c269b835bab782673a440140fb28e3e2d853f0694
|
data/lib/mxx_ru/cpp/toolset.rb
CHANGED
@@ -272,6 +272,11 @@ module MxxRu
|
|
272
272
|
# Since v.1.6.3
|
273
273
|
CPP_STD14 = 3
|
274
274
|
|
275
|
+
# C++17 standard.
|
276
|
+
#
|
277
|
+
# Since v.1.6.14.3
|
278
|
+
CPP_STD17 = 4
|
279
|
+
|
275
280
|
# Base toolset class.
|
276
281
|
# Toolset is a compiler and tool set for compiling an application.
|
277
282
|
class Toolset
|
@@ -1031,6 +1036,13 @@ module MxxRu
|
|
1031
1036
|
set_cpp_std CPP_STD14
|
1032
1037
|
end
|
1033
1038
|
|
1039
|
+
# Set C++17 standard version.
|
1040
|
+
#
|
1041
|
+
# Since v.1.6.14.3
|
1042
|
+
def force_cpp17
|
1043
|
+
set_cpp_std CPP_STD17
|
1044
|
+
end
|
1045
|
+
|
1034
1046
|
# Get the C++ standard version
|
1035
1047
|
attr_reader :cpp_std
|
1036
1048
|
|
@@ -78,7 +78,9 @@ module MxxRu
|
|
78
78
|
target.compiler_option( "-I" + p )
|
79
79
|
}
|
80
80
|
|
81
|
-
if
|
81
|
+
if CPP_STD17 == cpp_std
|
82
|
+
target.cpp_compiler_option( '-std=c++17' )
|
83
|
+
elsif CPP_STD14 == cpp_std
|
82
84
|
target.cpp_compiler_option( '-std=c++14' )
|
83
85
|
elsif CPP_STD11 == cpp_std
|
84
86
|
target.cpp_compiler_option( "-std=c++11" )
|
@@ -103,7 +103,9 @@ module MxxRu
|
|
103
103
|
target.compiler_option( "-I" + p )
|
104
104
|
}
|
105
105
|
|
106
|
-
if
|
106
|
+
if CPP_STD17 == cpp_std
|
107
|
+
target.cpp_compiler_option( '-std=c++17' )
|
108
|
+
elsif CPP_STD14 == cpp_std
|
107
109
|
target.cpp_compiler_option( '-std=c++14' )
|
108
110
|
elsif CPP_STD11 == cpp_std
|
109
111
|
target.cpp_compiler_option( '-std=c++11' )
|
@@ -53,7 +53,9 @@ module MxxRu
|
|
53
53
|
def setup_mandatory_options( target )
|
54
54
|
super( target )
|
55
55
|
|
56
|
-
if
|
56
|
+
if CPP_STD17 == cpp_std
|
57
|
+
target.cpp_compiler_option( '/std:c++17' )
|
58
|
+
elsif CPP_STD14 == cpp_std
|
57
59
|
target.cpp_compiler_option( '/std:c++14' )
|
58
60
|
end
|
59
61
|
end
|
data/lib/mxx_ru/version.rb
CHANGED
Binary file
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: Mxx_ru
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.14.
|
4
|
+
version: 1.6.14.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- The Mxx_ru Project
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-09-06 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: Mxx_ru is a cross-platform build tool primarily focused to C/C++ projects
|
14
14
|
email: eao197@yahoo.com
|
@@ -170,6 +170,7 @@ files:
|
|
170
170
|
- tests/cpp/custom_target_prefix/dll.cpp
|
171
171
|
- tests/cpp/custom_target_prefix/dll.rb
|
172
172
|
- tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb
|
173
|
+
- tests/cpp/lib_from_lib_dependecies/a.cpp
|
173
174
|
- tests/cpp/lib_from_lib_dependecies/a.rb
|
174
175
|
- tests/cpp/lib_from_lib_dependecies/b.cpp
|
175
176
|
- tests/cpp/lib_from_lib_dependecies/b.rb
|
@@ -355,6 +356,7 @@ files:
|
|
355
356
|
- tests/unix/lib_linking_mode/main_static_2.cpp
|
356
357
|
- tests/unix/lib_linking_mode/main_static_2.rb
|
357
358
|
- tests/unix/lib_linking_mode/main_static_2.ut.rb
|
359
|
+
- tests/unix/lib_linking_mode/o/main_conflict.o
|
358
360
|
- tests/unix/lib_linking_mode/tc_conflicted_build.rb
|
359
361
|
- tests/unix/lib_linking_mode/tc_normal_build.rb
|
360
362
|
- tests/unix/lib_order/a.cpp
|