Prechádzať zdrojové kódy

COMP: Move "find_program(CTK_PATCH_EXECUTABLE ...) into each external project script.

Jean-Christophe Fillion-Robin 15 rokov pred
rodič
commit
7c2a326708

+ 9 - 0
CMakeExternals/PythonQt.cmake

@@ -15,6 +15,15 @@ IF(${add_project})
       MESSAGE(FATAL_ERROR "error: Python is required to build ${PROJECT_NAME}")
     ENDIF()
 
+    # Patch program
+    FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
+      "C:/Program Files/GnuWin32/bin"
+      "C:/Program Files (x86)/GnuWin32/bin")
+    MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
+    IF(NOT CTK_PATCH_EXECUTABLE)
+      MESSAGE(FATAL_ERROR "error: Patch is required to build ${PROJECT_NAME}. Set CTK_PATCH_EXECUTABLE")
+    ENDIF()
+
     # Configure patch script
     SET(pythonqt_src_dir ${ep_source_dir}/${proj})
     SET(pythonqt_patch_dir ${CTK_SOURCE_DIR}/Utilities/PythonQt/)

+ 9 - 0
CMakeExternals/QtMobility.cmake

@@ -7,6 +7,15 @@ IF(${add_project})
   SET(proj QtMobility)
 #   MESSAGE(STATUS "Adding project:${proj}")
   SET(QtMobility_DEPENDS ${proj})
+
+  # Patch program
+  FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
+    "C:/Program Files/GnuWin32/bin"
+    "C:/Program Files (x86)/GnuWin32/bin")
+  MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
+  IF(NOT CTK_PATCH_EXECUTABLE)
+    MESSAGE(FATAL_ERROR "error: Patch is required to build ${PROJECT_NAME}. Set CTK_PATCH_EXECUTABLE")
+  ENDIF()
   
   # Configure patch script
   SET(qtmobility_src_dir ${ep_source_dir}/${proj})

+ 0 - 8
CMakeLists.txt

@@ -135,14 +135,6 @@ SET(CTK_CMAKE_DIR ${CTK_SOURCE_DIR}/CMake)
 SET(CTK_CMAKE_UTILITIES_DIR ${CTK_SOURCE_DIR}/Utilities/CMake)
 
 #-----------------------------------------------------------------------------
-# Patch program
-#
-FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
-  "C:/Program Files/GnuWin32/bin"
-  "C:/Program Files (x86)/GnuWin32/bin")
-MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
-
-#-----------------------------------------------------------------------------
 # Testing
 #
 OPTION(BUILD_TESTING "Test the project" ON)