From e33cbda5c459e10bcbfc1f407951f9deaffe8fdf Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 6 Jan 2011 09:10:35 -0500 Subject: [PATCH] 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. --- Tests/VSMidl/src/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Tests/VSMidl/src/CMakeLists.txt b/Tests/VSMidl/src/CMakeLists.txt index 28bb1205d..86c04ed98 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)