Utilities/Release: Move cygwin packages to a subdirectory

This commit is contained in:
Brad King 2015-10-06 10:13:28 -04:00
parent 992c43d2ed
commit fab35c95cb
2 changed files with 15 additions and 6 deletions

View File

@ -28,4 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
# allows us to produce cygwin builds in the short term. # allows us to produce cygwin builds in the short term.
set(EXTRA_CTEST_ARGS "-E ExternalProject") set(EXTRA_CTEST_ARGS "-E ExternalProject")
set(LOCAL_DIR cygwin)
include(${path}/release_cmake.cmake) include(${path}/release_cmake.cmake)

View File

@ -119,27 +119,34 @@ foreach(gen ${generators})
set(SUFFIXES ${SUFFIXES} "*.exe") set(SUFFIXES ${SUFFIXES} "*.exe")
endif() endif()
endforeach() endforeach()
if(LOCAL_DIR)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}")
else()
set(LOCAL_DIR .)
endif()
# copy all the files over from the remote machine # copy all the files over from the remote machine
set(PROJECT_PREFIX cmake-) set(PROJECT_PREFIX cmake-)
foreach(suffix ${SUFFIXES}) foreach(suffix ${SUFFIXES})
message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
execute_process(COMMAND execute_process(COMMAND
scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} . scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}
RESULT_VARIABLE result) RESULT_VARIABLE result)
if(${result} GREATER 0) if(${result} GREATER 0)
message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
endif() endif()
endforeach() endforeach()
# if there are extra files to copy get them as well # if there are extra files to copy get them as well
if(extra_files) if(extra_files)
foreach(f ${extra_files}) foreach(f ${extra_files})
message("scp ${HOST}:${FINAL_PATH}/${f} .") message("scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
execute_process(COMMAND execute_process(COMMAND
scp ${HOST}:${FINAL_PATH}/${f} . scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}
RESULT_VARIABLE result) RESULT_VARIABLE result)
if(${result} GREATER 0) if(${result} GREATER 0)
message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} .") message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
endif() endif()
endforeach() endforeach()
endif() endif()