qt-5.4.2.patch 940 B

123456789101112131415161718192021222324
  1. From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
  2. Date: Thu, 28 May 2015 15:56:47 +0000
  3. Subject: Yet another _include_dirs fix
  4. X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
  5. ---
  6. Yet another _include_dirs fix
  7. The variable is set as a definition, so mark it as such
  8. ---
  9. --- a/cmake/FindPhononInternal.cmake
  10. +++ b/cmake/FindPhononInternal.cmake
  11. @@ -409,7 +409,7 @@
  12. file(WRITE "${_source_file}" "${_source}")
  13. set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
  14. - try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
  15. + try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
  16. if(NOT _compile_result)
  17. message("${_compile_output_var}")