Explorar o código

ENH: Change ctkMacroApplyPatches into ctkFunctionApplyPatches

In CMake, Function are preferred over Macro
Jean-Christophe Fillion-Robin %!s(int64=15) %!d(string=hai) anos
pai
achega
7a33e4da5f

+ 2 - 2
CMake/ctkMacroApplyPatches.cmake

@@ -2,7 +2,7 @@
 #
 #
 
-MACRO(ctkMacroApplyPatches PATCH_EXE SRC_DIR PATCH_FILES)
+FUNCTION(ctkFunctionApplyPatches PATCH_EXE SRC_DIR PATCH_FILES)
   
   # Make sure patch executable exists
   IF(NOT EXISTS ${PATCH_EXE})
@@ -18,4 +18,4 @@ MACRO(ctkMacroApplyPatches PATCH_EXE SRC_DIR PATCH_FILES)
     ENDIF(result_var)
   ENDFOREACH()
   
-ENDMACRO()
+ENDFUNCTION()

+ 2 - 2
Utilities/QtMobility/QtMobility-1.0.0-patch.cmake.in

@@ -5,7 +5,7 @@ set(work_dir @ep_source_dir@)
 set(proj_dir ${work_dir}/@proj@)
 
 
-INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkMacroApplyPatches.cmake)
+INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkFunctionApplyPatches.cmake)
 
 SET(patch_dir @qtmobility_patch_dir@)
 SET(configured_patch_dir @qtmobility_configured_patch_dir@)
@@ -32,7 +32,7 @@ IF(UNIX)
 ENDIF()
 
 # Apply patches
-ctkMacroApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
+ctkFunctionApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
 
 IF(UNIX)
 

+ 2 - 2
Utilities/QtMobility/QtMobilityBeta1-patch.cmake.in

@@ -1,4 +1,4 @@
-INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkMacroApplyPatches.cmake)
+INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkFunctionApplyPatches.cmake)
 
 SET(patch_dir @qtmobility_patch_dir@)
 SET(configured_patch_dir @qtmobility_configured_patch_dir@)
@@ -28,4 +28,4 @@ IF(UNIX)
 ENDIF()
 
 # Apply patches
-ctkMacroApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
+ctkFunctionApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")

+ 2 - 2
Utilities/QtMobility/QtMobilityGitBranch1.0-patch.cmake.in

@@ -17,7 +17,7 @@ if(error_code)
 endif()
 
 
-INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkMacroApplyPatches.cmake)
+INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkFunctionApplyPatches.cmake)
 
 SET(patch_dir @qtmobility_patch_dir@)
 SET(configured_patch_dir @qtmobility_configured_patch_dir@)
@@ -43,7 +43,7 @@ IF(UNIX)
 ENDIF()
 
 # Apply patches
-ctkMacroApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
+ctkFunctionApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
 
 IF(UNIX)