瀏覽代碼

Ensure that log4qt uses the Qt defined by CTK. This is accomplished by passing QT_QMAKE_EXECUTABLE into the cmake command used no configure log4Qt.

Daniel Blezek 15 年之前
父節點
當前提交
baec68b597
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      CMakeExternals/log4qt.cmake

+ 1 - 0
CMakeExternals/log4qt.cmake

@@ -14,6 +14,7 @@ IF(${add_project})
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/${proj}
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/${proj}
         CMAKE_ARGS
         CMAKE_ARGS
           ${ep_common_args}
           ${ep_common_args}
+          -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
         )
         )
     SET(log4qt_DIR ${ep_install_dir})
     SET(log4qt_DIR ${ep_install_dir})
   ENDIF()
   ENDIF()