Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
André Pedro
CMake
Commits
364ac7e3
Commit
364ac7e3
authored
16 years ago
by
Bill Hoffman
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix empty /D option for vs6, fix for 7580
parent
4d3ae30b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/cmLocalVisualStudio6Generator.cxx
+8
-1
8 additions, 1 deletion
Source/cmLocalVisualStudio6Generator.cxx
Templates/EXEHeader.dsptemplate
+4
-4
4 additions, 4 deletions
Templates/EXEHeader.dsptemplate
with
12 additions
and
5 deletions
Source/cmLocalVisualStudio6Generator.cxx
+
8
−
1
View file @
364ac7e3
...
...
@@ -1314,6 +1314,13 @@ void cmLocalVisualStudio6Generator
}
std
::
string
line
;
std
::
string
libnameExports
;
if
(
exportSymbol
.
size
())
{
libnameExports
=
"/D
\"
"
;
libnameExports
+=
exportSymbol
;
libnameExports
+=
"
\"
"
;
}
while
(
cmSystemTools
::
GetLineFromStream
(
fin
,
line
))
{
const
char
*
mfcFlag
=
this
->
Makefile
->
GetDefinition
(
"CMAKE_MFC_FLAG"
);
...
...
@@ -1322,7 +1329,7 @@ void cmLocalVisualStudio6Generator
mfcFlag
=
"0"
;
}
cmSystemTools
::
ReplaceString
(
line
,
"OUTPUT_LIBNAME_EXPORTS"
,
exportSymbol
.
c_str
());
libnameExports
.
c_str
());
cmSystemTools
::
ReplaceString
(
line
,
"CMAKE_MFC_FLAG"
,
mfcFlag
);
if
(
target
.
GetType
()
==
cmTarget
::
STATIC_LIBRARY
)
...
...
This diff is collapsed.
Click to expand it.
Templates/EXEHeader.dsptemplate
+
4
−
4
View file @
364ac7e3
...
...
@@ -58,7 +58,7 @@ RSC=rc.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES
/D "
OUTPUT_LIBNAME_EXPORTS
"
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
# ADD CPP CMAKE_CXX_FLAGS
# ADD CPP CMAKE_CXX_FLAGS_RELEASE
# ADD BASE RSC /l 0x409 /d "NDEBUG"
...
...
@@ -88,7 +88,7 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
# PROP Target_Dir ""
# ADD BASE CPP /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
# ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES
/D "
OUTPUT_LIBNAME_EXPORTS
"
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
# ADD CPP CMAKE_CXX_FLAGS
# ADD CPP CMAKE_CXX_FLAGS_DEBUG
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
...
...
@@ -119,7 +119,7 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
# PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP /nologo /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES
/D "
OUTPUT_LIBNAME_EXPORTS
"
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
# ADD CPP CMAKE_CXX_FLAGS
# ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
# ADD BASE RSC /l 0x409 /d "NDEBUG"
...
...
@@ -149,7 +149,7 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
# PROP Target_Dir ""
# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES
/D "
OUTPUT_LIBNAME_EXPORTS
"
# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
# ADD CPP CMAKE_CXX_FLAGS
# ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
# ADD BASE RSC /l 0x409 /d "NDEBUG"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment