Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Maik Froechtenicht
glew
Commits
a30e0089
Commit
a30e0089
authored
Oct 28, 2017
by
dimitri
Committed by
Nigel Stewart
Nov 05, 2017
Browse files
No longer need conanfile string replacement for win gcc.
parent
07b759b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
build/conan/conanfile.py
View file @
a30e0089
...
@@ -68,11 +68,6 @@ class GlewConan(ConanFile):
...
@@ -68,11 +68,6 @@ class GlewConan(ConanFile):
vcvars
=
vcvars_command
(
self
.
settings
)
vcvars
=
vcvars_command
(
self
.
settings
)
self
.
run
(
"%s && %s && %s"
%
(
vcvars
,
cd_build
,
build_command
.
replace
(
"x86"
,
"Win32"
)))
self
.
run
(
"%s && %s && %s"
%
(
vcvars
,
cd_build
,
build_command
.
replace
(
"x86"
,
"Win32"
)))
else
:
else
:
if
self
.
settings
.
os
==
"Windows"
:
replace_in_file
(
"%s/build/cmake/CMakeLists.txt"
%
self
.
source_directory
,
\
"if(WIN32 AND (NOT MSVC_VERSION LESS 1600)"
,
\
"if(WIN32 AND MSVC AND (NOT MSVC_VERSION LESS 1600)"
)
if
self
.
version
==
"master"
:
if
self
.
version
==
"master"
:
self
.
run
(
"make extensions"
)
self
.
run
(
"make extensions"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment