diff options
| author | Brad King <brad.king@kitware.com> | 2006-04-18 15:53:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-04-18 15:53:41 (GMT) |
| commit | 7b4adecf9826bc6c099e0230c81549382517bf11 (patch) | |
| tree | 9f9a215077a41963b05e398e2967977d98d3bdfe | |
| parent | d5237b30fc8eca9c56c8ee7f671cb00f7303c169 (diff) | |
| download | CMake-7b4adecf9826bc6c099e0230c81549382517bf11.zip CMake-7b4adecf9826bc6c099e0230c81549382517bf11.tar.gz CMake-7b4adecf9826bc6c099e0230c81549382517bf11.tar.bz2 | |
BUG: Do not require language flags variables. Other generators do not, and it breaks programmable language support (like the Java test).
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index b1406d3..7310953 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1224,10 +1224,10 @@ void cmLocalVisualStudio6Generator std::string baseFlagVar = "CMAKE_"; baseFlagVar += linkLanguage; baseFlagVar += "_FLAGS"; - flags = this->Makefile->GetRequiredDefinition(baseFlagVar.c_str()); + flags = this->Makefile->GetSafeDefinition(baseFlagVar.c_str()); std::string flagVar = baseFlagVar + "_RELEASE"; - flagsRelease = this->Makefile->GetRequiredDefinition(flagVar.c_str()); + flagsRelease = this->Makefile->GetSafeDefinition(flagVar.c_str()); flagsRelease += " -DCMAKE_INTDIR=\\\"Release\\\" "; if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELEASE")) { @@ -1235,7 +1235,7 @@ void cmLocalVisualStudio6Generator flagsRelease += " "; } flagVar = baseFlagVar + "_MINSIZEREL"; - flagsMinSize = this->Makefile->GetRequiredDefinition(flagVar.c_str()); + flagsMinSize = this->Makefile->GetSafeDefinition(flagVar.c_str()); flagsMinSize += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" "; if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_MINSIZEREL")) { @@ -1244,7 +1244,7 @@ void cmLocalVisualStudio6Generator } flagVar = baseFlagVar + "_DEBUG"; - flagsDebug = this->Makefile->GetRequiredDefinition(flagVar.c_str()); + flagsDebug = this->Makefile->GetSafeDefinition(flagVar.c_str()); flagsDebug += " -DCMAKE_INTDIR=\\\"Debug\\\" "; if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_DEBUG")) { @@ -1253,7 +1253,7 @@ void cmLocalVisualStudio6Generator } flagVar = baseFlagVar + "_RELWITHDEBINFO"; - flagsDebugRel = this->Makefile->GetRequiredDefinition(flagVar.c_str()); + flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str()); flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" "; if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELWITHDEBINFO")) { |