浏览代码

Fix parsing include dirs and builtin macros for CXX-only projects

Alex
Alex Neundorf 14 年之前
父节点
当前提交
4371147ef4
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      Modules/CMakeFindEclipseCDT4.cmake

+ 7 - 1
Modules/CMakeFindEclipseCDT4.cmake

@@ -32,7 +32,13 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
   SET(${_resultIncludeDirs})
   SET(_gccOutput)
   FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" )
-  EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -v -E -x ${_lang} -dD dummy
+
+  IF (${_lang} STREQUAL "c++")
+    SET(_compilerExecutable "${CMAKE_CXX_COMPILER}")
+  ELSE (${_lang} STREQUAL "c++")
+    SET(_compilerExecutable "${CMAKE_C_COMPILER}")
+  ENDIF (${_lang} STREQUAL "c++")
+  EXECUTE_PROCESS(COMMAND ${_compilerExecutable} -v -E -x ${_lang} -dD dummy
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
                   ERROR_VARIABLE _gccOutput
                   OUTPUT_VARIABLE _gccStdout )