|
@@ -62,3 +62,12 @@ IF(UNIX)
|
|
MESSAGE(FATAL_ERROR "Patching ${proj_dir}/configure file failed.")
|
|
MESSAGE(FATAL_ERROR "Patching ${proj_dir}/configure file failed.")
|
|
ENDIF()
|
|
ENDIF()
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
+
|
|
|
|
+# Let's add the updated files to the local repository. That way, 'git pull'
|
|
|
|
+# will try to merge the branch changes with the local ones
|
|
|
|
+execute_process(
|
|
|
|
+ COMMAND @Git_EXECUTABLE@ add --all
|
|
|
|
+ WORKING_DIRECTORY ${proj_dir}
|
|
|
|
+ ERROR_VARIABLE error_output
|
|
|
|
+ RESULT_VARIABLE error_code
|
|
|
|
+ )
|