浏览代码

COMP: In Superbuild.cmake, use CTK_{SOURCE, BINARY}_DIR instead of CMAKE_CURRENT_*_DIR

Jean-Christophe Fillion-Robin 15 年之前
父节点
当前提交
4f889d363b
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      SuperBuild.cmake

+ 5 - 5
SuperBuild.cmake

@@ -213,8 +213,8 @@ ExternalProject_Add(${proj}
     -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}        # FindPythonQt expects PYTHON_LIBRARY variable to be defined
     -DPYTHONQT_INSTALL_DIR:PATH=${PYTHONQT_INSTALL_DIR} # FindPythonQt expects PYTHONQT_INSTALL_DIR variable to be defined
     -Dlog4cpp_DIR:PATH=${log4cpp_DIR} # Findlog4cpp expects a log4cpp_DIR variable to be defined
-  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-  BINARY_DIR ${CMAKE_BINARY_DIR}/CTK-build
+  SOURCE_DIR ${CTK_SOURCE_DIR}
+  BINARY_DIR ${CTK_BINARY_DIR}/CTK-build
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
   DEPENDS
@@ -231,7 +231,7 @@ IF(NOT DEFINED SUPERBUILD_EXCLUDE_CTKBUILD_TARGET OR NOT SUPERBUILD_EXCLUDE_CTKB
   ExternalProject_Add(${proj}
     DOWNLOAD_COMMAND ""
     CMAKE_GENERATOR ${gen}
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+    SOURCE_DIR ${CTK_SOURCE_DIR}
     BINARY_DIR CTK-build
     INSTALL_COMMAND ""
     DEPENDS
@@ -243,6 +243,6 @@ ENDIF()
 # Custom target allowing to drive the build of CTK project itself
 #
 ADD_CUSTOM_TARGET(CTK
-  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/CTK-build
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CTK-build
+  COMMAND ${CMAKE_COMMAND} --build ${CTK_BINARY_DIR}/CTK-build
+  WORKING_DIRECTORY ${CTK_BINARY_DIR}/CTK-build
   )