diff options
| author | David Cole <david.cole@kitware.com> | 2011-01-06 14:10:35 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-01-06 14:12:20 (GMT) |
| commit | e33cbda5c459e10bcbfc1f407951f9deaffe8fdf (patch) | |
| tree | 5d4f06cd181fb06dad838ff983e865ef3376b0be /Tests | |
| parent | 262da91e26e7641192549028fee40b4c62e25266 (diff) | |
| download | CMake-e33cbda5c459e10bcbfc1f407951f9deaffe8fdf.zip CMake-e33cbda5c459e10bcbfc1f407951f9deaffe8fdf.tar.gz CMake-e33cbda5c459e10bcbfc1f407951f9deaffe8fdf.tar.bz2 | |
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.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/VSMidl/src/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
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) |