Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
CMake
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2,684
Issues
2,684
List
Boards
Labels
Milestones
Merge Requests
20
Merge Requests
20
Packages
Packages
Container Registry
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
CMake
CMake
Commits
51e48637
Commit
51e48637
authored
Sep 27, 2015
by
Stephen Kelly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VS: Remove impossible condition.
parent
203eada6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
Source/cmGlobalVisualStudioGenerator.cxx
Source/cmGlobalVisualStudioGenerator.cxx
+2
-3
No files found.
Source/cmGlobalVisualStudioGenerator.cxx
View file @
51e48637
...
...
@@ -192,7 +192,7 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros()
cmMakefile
*
mf
=
this
->
LocalGenerators
[
0
]
->
GetMakefile
();
std
::
string
dir
=
this
->
GetUserMacrosDirectory
();
if
(
mf
!=
0
&&
dir
!=
""
)
if
(
dir
!=
""
)
{
std
::
string
src
=
mf
->
GetRequiredDefinition
(
"CMAKE_ROOT"
);
src
+=
"/Templates/"
CMAKE_VSMACROS_FILENAME
;
...
...
@@ -233,13 +233,12 @@ cmGlobalVisualStudioGenerator
std
::
string
dir
=
this
->
GetUserMacrosDirectory
();
// Only really try to call the macro if:
// - mf is non-NULL
// - there is a UserMacrosDirectory
// - the CMake vsmacros file exists
// - the CMake vsmacros file is registered
// - there were .sln/.vcproj files changed during generation
//
if
(
mf
!=
0
&&
dir
!=
""
)
if
(
dir
!=
""
)
{
std
::
string
macrosFile
=
dir
+
"/CMakeMacros/"
CMAKE_VSMACROS_FILENAME
;
std
::
string
nextSubkeyName
;
...
...
Write
Preview
Markdown
is supported
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