Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
941947d2
Commit
941947d2
authored
Dec 12, 2016
by
Jan Möbius
Browse files
Fixed fix
parent
d75b5850
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/package.cmake
View file @
941947d2
...
...
@@ -195,9 +195,9 @@ if (WIN32)
elseif
(
CMAKE_GENERATOR MATCHES
"^Visual Studio 12.*"
)
SET
(
REDISTRIBUTABLE_FILE
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/vs2013/x32/vcredist_x86.exe"
)
elseif
(
CMAKE_GENERATOR MATCHES
"^Visual Studio 14.*Win64"
)
SET
(
REDISTRIBUTABLE_FILE
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/vs2015/x64/vcredist
.
x64.exe"
)
SET
(
REDISTRIBUTABLE_FILE
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/vs2015/x64/vcredist
_
x64.exe"
)
elseif
(
CMAKE_GENERATOR MATCHES
"^Visual Studio 14.*"
)
SET
(
REDISTRIBUTABLE_FILE
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/vs2015/x32/vcredist
.
x86.exe"
)
SET
(
REDISTRIBUTABLE_FILE
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/vs2015/x32/vcredist
_
x86.exe"
)
endif
()
# append dll's to installed package
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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