diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-14 20:07:11 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-14 20:07:11 (GMT) |
| commit | 9d9582ffef2ab58f859a28d012cf89ee38c3a411 (patch) | |
| tree | 519a0e38aef23a6d4c77897dde02d8d1273ad72f /Modules/Platform/Windows-cl.cmake | |
| parent | ec9f2a18cc67d54c48dc8e88bc6edad23c611a34 (diff) | |
| download | CMake-9d9582ffef2ab58f859a28d012cf89ee38c3a411.zip CMake-9d9582ffef2ab58f859a28d012cf89ee38c3a411.tar.gz CMake-9d9582ffef2ab58f859a28d012cf89ee38c3a411.tar.bz2 | |
ENH: fix problem where rc language recursively included itself because CMAKE_BASE_NAME was used from c compiler, do the same fix for other uses of CMAKE_BASE_NAME
Diffstat (limited to 'Modules/Platform/Windows-cl.cmake')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 06169b0..562b2b0 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -29,10 +29,7 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 9") # make sure to enable languages after setting configuration types -IF(NOT ENABLE_LANGUAGE_RC_CALLED AND NOT CMAKE_DO_TRY_COMPILE) - ENABLE_LANGUAGE(RC) -ENDIF(NOT ENABLE_LANGUAGE_RC_CALLED AND NOT CMAKE_DO_TRY_COMPILE) -SET(ENABLE_LANGUAGE_RC_CALLED TRUE) +ENABLE_LANGUAGE(RC) SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") # for nmake we need to compute some information about the compiler |