[Cmake-commits] CMake branch, next, updated. v2.8.3-1154-ge207994

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e207994883b65b3ddcfdbfec9c0068f59252d796 (commit)
       via  90b0f2c624e0df635abe551825befa729c2aa072 (commit)
      from  2a672c1206e6fbe8ef6b3a7998f6a361d1168018 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e207994883b65b3ddcfdbfec9c0068f59252d796
commit e207994883b65b3ddcfdbfec9c0068f59252d796
Merge: 2a672c1 90b0f2c
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Jan 3 14:07:14 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 3 14:07:14 2011 -0500

    Merge topic 'add_resource_support_to_intel' into next
    
    90b0f2c Enable resource building with the intel compiler on windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90b0f2c624e0df635abe551825befa729c2aa072
commit 90b0f2c624e0df635abe551825befa729c2aa072
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Jan 3 14:02:22 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Mon Jan 3 14:02:22 2011 -0500

    Enable resource building with the intel compiler on windows.

diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake
index 444a60e..e7462ba 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -18,6 +18,10 @@ if(__WINDOWS_INTEL)
 endif()
 set(__WINDOWS_INTEL 1)
 
+# make sure to enable languages after setting configuration types
+ENABLE_LANGUAGE(RC)
+SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
+
 SET(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:")
 SET(CMAKE_LINK_LIBRARY_FLAG "")
 SET(WIN32 1)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-Intel.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake