diff options
| author | Ken Martin <ken.martin@kitware.com> | 2005-06-07 16:07:34 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2005-06-07 16:07:34 (GMT) |
| commit | 810878649442bc6dadc002edf92ff0e725138465 (patch) | |
| tree | 0fe59db39f0c9d9081f3ccbdff15e5a006c371d4 | |
| parent | 7758abb2e657d26d474fe3db55c59b08e292975f (diff) | |
| download | CMake-810878649442bc6dadc002edf92ff0e725138465.zip CMake-810878649442bc6dadc002edf92ff0e725138465.tar.gz CMake-810878649442bc6dadc002edf92ff0e725138465.tar.bz2 | |
ENH: fix for incorrect setting of CONFIZGURATION_TYPES
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 7 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index cfdf576..9d975b9 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -35,9 +35,6 @@ SET(CMAKE_C_COMPILE_OBJECT SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> /nologo ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") -ENABLE_LANGUAGE(RC) -SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") - SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> /nologo ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") @@ -62,6 +59,10 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") SET(CMAKE_COMPILER_2005 1) ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") +# make sure to enable languages after setting configuration types +ENABLE_LANGUAGE(RC) +SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") + # for nmake we need to compute some information about the compiler # that is being used. # the compiler may be free command line, 6, 7, or 71, and diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index e29b076..a604485 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -39,8 +39,8 @@ void cmGlobalVisualStudio7Generator::EnableLanguage(std::vector<std::string>cons mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort"); // Create list of configurations requested by user's cache, if any. - this->GenerateConfigurations(mf); this->cmGlobalGenerator::EnableLanguage(lang, mf); + this->GenerateConfigurations(mf); } std::string cmGlobalVisualStudio7Generator::GenerateBuildCommand(const char* makeProgram, |