Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
1ecd48ba
Commit
1ecd48ba
authored
Feb 24, 2006
by
Andy Cedilnik
Browse files
COMP: Fix for preinstall
parent
743b4c99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobalVisualStudio71Generator.cxx
View file @
1ecd48ba
...
...
@@ -59,6 +59,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
bool
doneEditCache
=
false
;
bool
doneRebuildCache
=
false
;
bool
donePackage
=
false
;
bool
donePreInstall
=
false
;
// For each cmMakefile, create a VCProj for it, and
// add it to this SLN file
...
...
@@ -168,6 +169,17 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
doneInstall
=
true
;
}
}
if
(
l
->
first
==
"preinstall"
)
{
if
(
donePreInstall
)
{
skip
=
true
;
}
else
{
donePreInstall
=
true
;
}
}
if
(
l
->
first
==
"RUN_TESTS"
)
{
if
(
doneRunTests
)
...
...
Source/cmGlobalVisualStudio7Generator.cxx
View file @
1ecd48ba
...
...
@@ -210,6 +210,11 @@ void cmGlobalVisualStudio7Generator::Generate()
no_working_dir
,
cmake_command
.
c_str
(),
"-DBUILD_TYPE=$(OutDir)"
,
"-P"
,
"cmake_install.cmake"
);
gen
[
0
]
->
GetMakefile
()
->
AddUtilityCommand
(
"preinstall"
,
false
,
no_output
,
no_depends
,
no_working_dir
,
cmake_command
.
c_str
(),
"-E"
,
"echo"
,
"preinstall"
);
// Make the INSTALL target depend on ALL_BUILD unless the
// project says to not do so.
...
...
@@ -283,6 +288,7 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
bool
doneEditCache
=
false
;
bool
doneRebuildCache
=
false
;
bool
donePackage
=
false
;
bool
donePreInstall
=
false
;
// For each cmMakefile, create a VCProj for it, and
// add it to this SLN file
...
...
@@ -381,6 +387,17 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
doneInstall
=
true
;
}
}
if
(
l
->
first
==
"preinstall"
)
{
if
(
donePreInstall
)
{
skip
=
true
;
}
else
{
donePreInstall
=
true
;
}
}
if
(
l
->
first
==
"RUN_TESTS"
)
{
if
(
doneRunTests
)
...
...
@@ -743,6 +760,7 @@ void cmGlobalVisualStudio7Generator::Configure()
cmGlobalGenerator
::
Configure
();
this
->
CreateGUID
(
"ALL_BUILD"
);
this
->
CreateGUID
(
"INSTALL"
);
this
->
CreateGUID
(
"preinstall"
);
this
->
CreateGUID
(
"RUN_TESTS"
);
this
->
CreateGUID
(
"EDIT_CACHE"
);
this
->
CreateGUID
(
"REBUILD_CACHE"
);
...
...
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