summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudioGeneratorOptions.h
diff options
context:
space:
mode:
authorZack Galbreath <zack.galbreath@kitware.com>2014-11-14 18:47:00 (GMT)
committerZack Galbreath <zack.galbreath@kitware.com>2014-11-21 18:32:45 (GMT)
commit17b0fe03052bcbc45293139d408e008371f1ffe0 (patch)
treea360e27dc2eb5c3467779b5ac5ae2ff3f2a98848 /Source/cmVisualStudioGeneratorOptions.h
parent0700f2ef1918a4bf9de197e1b25f1e2a00eb82f5 (diff)
downloadCMake-17b0fe03052bcbc45293139d408e008371f1ffe0.zip
CMake-17b0fe03052bcbc45293139d408e008371f1ffe0.tar.gz
CMake-17b0fe03052bcbc45293139d408e008371f1ffe0.tar.bz2
Fix incremental linking setting for Fortran + VS
This commit fixes a bug where it was impossible to specify /INCREMENTAL to Fortran projects built with Visual Studio. The problem was due to the fact that .vfproj files expect the value of this flag to be "linkIncremental{No,Yes}, whereas .vcproj files expect this value to be 0, 1, or 2. The implementation of this fix adds a new data structure for Visual Studio linker flags specific to Fortran. This can easily be extended in the future if more such discrepencies between C/C++ and Fortran linking are discovered.
Diffstat (limited to 'Source/cmVisualStudioGeneratorOptions.h')
-rw-r--r--Source/cmVisualStudioGeneratorOptions.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h
index 9951033..5490a43 100644
--- a/Source/cmVisualStudioGeneratorOptions.h
+++ b/Source/cmVisualStudioGeneratorOptions.h
@@ -38,6 +38,13 @@ public:
cmVS7FlagTable const* extraTable = 0,
cmVisualStudio10TargetGenerator* g = 0);
+ cmVisualStudioGeneratorOptions(cmLocalVisualStudioGenerator* lg,
+ Tool tool,
+ cmVisualStudio10TargetGenerator* g = 0);
+
+ // Add a table of flags.
+ void AddTable(cmVS7FlagTable const* table);
+
// Store options from command line flags.
void Parse(const char* flags);
void ParseFinish();