[Cmake-commits] CMake branch, next, updated. v2.8.3-1218-gd28b617

[David Cole]

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  d28b61757901852036c21e43ac9990f3d6d6086d (commit)
       via  e33cbda5c459e10bcbfc1f407951f9deaffe8fdf (commit)
      from  005e632700c7f8e89f610fdbf71fb96ccb6dd47c (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=d28b61757901852036c21e43ac9990f3d6d6086d
commit d28b61757901852036c21e43ac9990f3d6d6086d
Merge: 005e632 e33cbda
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 6 09:38:20 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 6 09:38:20 2011 -0500

    Merge topic 'fix-11461-add-midl-vs10' into next
    
    e33cbda VSMidl Test: Use correct include_directories with VS6 (#11461)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e33cbda5c459e10bcbfc1f407951f9deaffe8fdf
commit e33cbda5c459e10bcbfc1f407951f9deaffe8fdf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 6 09:10:35 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Jan 6 09:12:20 2011 -0500

    VSMidl Test: Use correct include_directories with VS6 (#11461)
    
    VS6 builds put midl output directly in CMAKE_CURRENT_BINARY_DIR.
    Adjust test include_directories to match. Fixes test failure
    on dashboard machine DASH3.

diff --git a/Tests/VSMidl/src/CMakeLists.txt b/Tests/VSMidl/src/CMakeLists.txt
index 28bb120..86c04ed 100644
--- a/Tests/VSMidl/src/CMakeLists.txt
+++ b/Tests/VSMidl/src/CMakeLists.txt
@@ -1,5 +1,12 @@
 cmake_minimum_required(VERSION 2.8)
 project(VSMidl)
 
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/\$(IntDir)")
+if(MSVC_VERSION GREATER 1200)
+  include_directories("${CMAKE_CURRENT_BINARY_DIR}/\$(IntDir)")
+else()
+  # midl generated headers end up directly in CMAKE_CURRENT_BINARY_DIR with
+  # VS6 builds.
+  include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+
 add_executable(VSMidl main.cpp test.idl)

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

Summary of changes:
 Tests/VSMidl/src/CMakeLists.txt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake