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
a12448c1
Commit
a12448c1
authored
May 15, 2001
by
Ken Martin
Browse files
added output directory support
parent
60a8a2f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Source/DLLHeader.dsptemplate
View file @
a12448c1
...
...
@@ -52,7 +52,7 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Output_Dir "
OUTPUT_LIBRARY_PATH
Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
...
...
@@ -79,7 +79,7 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Output_Dir "
OUTPUT_LIBRARY_PATH
Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
...
...
@@ -104,3 +104,4 @@ LINK32=link.exe
# Name "OUTPUT_LIBNAME - Win32 Release"
# Name "OUTPUT_LIBNAME - Win32 Debug"
Source/EXEHeader.dsptemplate
View file @
a12448c1
...
...
@@ -51,7 +51,7 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Output_Dir "
OUTPUT_EXECUTABLE_PATH
Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GR /GX /Zm1000 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
...
...
@@ -76,7 +76,7 @@ CM_MULTILINE_LIBRARIES
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Output_Dir "
OUTPUT_EXECUTABLE_PATH
Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /W3 /GR /Zm1000 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
...
...
@@ -102,7 +102,7 @@ CM_MULTILINE_LIBRARIES
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseMinSize"
# PROP Output_Dir "
OUTPUT_EXECUTABLE_PATH
ReleaseMinSize"
# PROP Intermediate_Dir "ReleaseMinSize"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GR /GX /Zm1000 /O1 /Gs /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
...
...
Source/EXEWinHeader.dsptemplate
View file @
a12448c1
...
...
@@ -51,7 +51,7 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Output_Dir "
OUTPUT_EXECUTABLE_PATH
Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GR /GX /Zm1000 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
...
...
@@ -78,7 +78,7 @@ CM_MULTILINE_LIBRARIES
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Output_Dir "
OUTPUT_EXECUTABLE_PATH
Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /W3 /GR /Zm1000 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
...
...
@@ -100,7 +100,7 @@ CM_MULTILINE_LIBRARIES
!ELSEIF "$(CFG)" == "OUTPUT_LIBNAME - Win32 Release MinSize"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ReleaseMinSize"
# PROP BASE Output_Dir "
OUTPUT_EXECUTABLE_PATH
ReleaseMinSize"
# PROP BASE Intermediate_Dir "ReleaseMinSize"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
...
...
Source/cmDSPMakefile.cxx
View file @
a12448c1
...
...
@@ -446,6 +446,18 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
std
::
string
libMultiLineDebugOptions
;
std
::
string
libMultiLineOptimizedOptions
;
// suppoirt override in output directory
std
::
string
libPath
=
""
;
if
(
m_Makefile
->
GetDefinition
(
"LIBRARY_OUTPUT_PATH"
))
{
libPath
=
m_Makefile
->
GetDefinition
(
"LIBRARY_OUTPUT_PATH"
);
}
std
::
string
exePath
=
""
;
if
(
m_Makefile
->
GetDefinition
(
"EXECUTABLE_OUTPUT_PATH"
))
{
exePath
=
m_Makefile
->
GetDefinition
(
"EXECUTABLE_OUTPUT_PATH"
);
}
std
::
vector
<
std
::
string
>::
iterator
i
;
std
::
vector
<
std
::
string
>&
libdirs
=
m_Makefile
->
GetLinkDirectories
();
for
(
i
=
libdirs
.
begin
();
i
!=
libdirs
.
end
();
++
i
)
...
...
@@ -540,6 +552,10 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
cmSystemTools
::
ReplaceString
(
line
,
"BUILD_INCLUDES"
,
m_IncludeOptions
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_LIBNAME"
,
libName
);
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_LIBRARY_PATH"
,
exePath
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_EXECUTABLE_PATH"
,
exePath
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"EXTRA_DEFINES"
,
m_Makefile
->
GetDefineFlags
());
...
...
Source/cmDSPWriter.cxx
View file @
a12448c1
...
...
@@ -446,6 +446,18 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
std
::
string
libMultiLineDebugOptions
;
std
::
string
libMultiLineOptimizedOptions
;
// suppoirt override in output directory
std
::
string
libPath
=
""
;
if
(
m_Makefile
->
GetDefinition
(
"LIBRARY_OUTPUT_PATH"
))
{
libPath
=
m_Makefile
->
GetDefinition
(
"LIBRARY_OUTPUT_PATH"
);
}
std
::
string
exePath
=
""
;
if
(
m_Makefile
->
GetDefinition
(
"EXECUTABLE_OUTPUT_PATH"
))
{
exePath
=
m_Makefile
->
GetDefinition
(
"EXECUTABLE_OUTPUT_PATH"
);
}
std
::
vector
<
std
::
string
>::
iterator
i
;
std
::
vector
<
std
::
string
>&
libdirs
=
m_Makefile
->
GetLinkDirectories
();
for
(
i
=
libdirs
.
begin
();
i
!=
libdirs
.
end
();
++
i
)
...
...
@@ -540,6 +552,10 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
cmSystemTools
::
ReplaceString
(
line
,
"BUILD_INCLUDES"
,
m_IncludeOptions
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_LIBNAME"
,
libName
);
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_LIBRARY_PATH"
,
exePath
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_EXECUTABLE_PATH"
,
exePath
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"EXTRA_DEFINES"
,
m_Makefile
->
GetDefineFlags
());
...
...
Source/staticLibHeader.dsptemplate
View file @
a12448c1
...
...
@@ -48,7 +48,7 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Output_Dir "
OUTPUT_LIBRARY_PATH
Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
...
...
@@ -71,7 +71,7 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Output_Dir "
OUTPUT_LIBRARY_PATH
Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
...
...
@@ -92,7 +92,7 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseMinSize"
# PROP Output_Dir "
OUTPUT_LIBRARY_PATH
ReleaseMinSize"
# PROP Intermediate_Dir "ReleaseMinSize"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
...
...
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