浏览代码

COMP: Expose QT_QMAKE_EXECUTABLE in the dashboard script

Using an hardcoded path was obviously working only on my machine !
Jean-Christophe Fillion-Robin 15 年之前
父节点
当前提交
a98ccdef3f
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 1
      CMake/ctkDashboardDriverScript.cmake
  2. 1 0
      CMake/ctkDashboardScript.EXAMPLE.cmake

+ 4 - 1
CMake/ctkDashboardDriverScript.cmake

@@ -33,6 +33,7 @@ set(expected_variables
   CTEST_CMAKE_GENERATOR
   WITH_MEMCHECK
   WITH_COVERAGE
+  WITH_DOCUMENTATION
   CTEST_BUILD_CONFIGURATION
   CTEST_TEST_TIMEOUT
   CTEST_BUILD_FLAGS
@@ -45,6 +46,7 @@ set(expected_variables
   CTEST_COVERAGE_COMMAND
   CTEST_MEMORYCHECK_COMMAND
   CTEST_GIT_COMMAND
+  QT_QMAKE_EXECUTABLE
   )
 
 foreach(var ${expected_variables})
@@ -111,9 +113,10 @@ MACRO(run_ctest)
     # Write initial cache.
     file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
 CTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS}
-QT_QMAKE_EXECUTABLE:FILEPATH=/home/jchris/Projects/qtsdk-2010.02/qt/bin/qmake
+QT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
 SUPERBUILD_EXCLUDE_CTKBUILD_TARGET:BOOL=TRUE
 WITH_COVERAGE:BOOL=TRUE
+DOCUMENTATION_TARGET_IN_ALL:BOOL=${WITH_DOCUMENTATION}
 ${ADDITIONNAL_CMAKECACHE_OPTION}
 ")
   endif()

+ 1 - 0
CMake/ctkDashboardScript.EXAMPLE.cmake

@@ -21,6 +21,7 @@ cmake_minimum_required(VERSION 2.8)
 set(MY_OPERATING_SYSTEM "Linux") # Windows, Linux, Darwin... 
 set(MY_COMPILER "g++4.3.3")
 set(MY_QT_VERSION "4.6.2")
+set(QT_QMAKE_EXECUTABLE "$ENV{HOME}/Projects/qtsdk-2010.02/qt/bin/qmake")
 set(CTEST_SITE "sagarmatha.kitware") # for example: mymachine.kitware, mymachine.dkfz, ...
 set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/Projects/")
 set(CTEST_CMAKE_COMMAND "$ENV{HOME}/Projects/cmake-trunk-build/bin/cmake")