瀏覽代碼

Merge branch 'usectk-export-qt-qmake-executable'

* usectk-export-qt-qmake-executable:
  UseCTK.cmake now sets the QT_QMAKE_EXECUTABLE variable
Julien Finet 12 年之前
父節點
當前提交
dd5da04af3
共有 1 個文件被更改,包括 8 次插入4 次删除
  1. 8 4
      CMake/UseCTK.cmake.in

+ 8 - 4
CMake/UseCTK.cmake.in

@@ -23,14 +23,18 @@
 # be INCLUDED in a project to load the needed compiler and linker
 # settings to use CTK.
 #
- 
+
 IF(NOT CTK_USE_FILE_INCLUDED)
   SET(CTK_USE_FILE_INCLUDED 1)
-  
+
   # Add include directories needed to use CTK.
   INCLUDE_DIRECTORIES(${CTK_INCLUDE_DIRS})
- 
+
   # Add link directories needed to use CTK.
   # LINK_DIRECTORIES(${CTK_LIBRARY_DIRS} ${CTK_EXTERNAL_LIBRARY_DIRS})
- 
+
+  if (NOT DEFINED QT_QMAKE_EXECUTABLE)
+    set(QT_QMAKE_EXECUTABLE ${CTK_QT_QMAKE_EXECUTABLE})
+  endif()
+
 ENDIF()