Просмотр исходного кода

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.
David Cole 15 лет назад
Родитель
Сommit
e33cbda5c4
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      Tests/VSMidl/src/CMakeLists.txt

+ 8 - 1
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)