aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Capens <capn@google.com>2018-03-20 10:46:14 -0400
committerNicolas Capens <nicolascapens@google.com>2018-03-20 14:47:19 +0000
commit0a7a073dd6cb158d74dd2c5bd0b5540f51fe09ff (patch)
tree16c4d4d23888ef93a7b5a781e08113f9242384ed
parentd51e939afaadfd5a9f0ba087add27b75ba328197 (diff)
downloadswiftshader-0a7a073dd6cb158d74dd2c5bd0b5540f51fe09ff.tar.gz
Split output binaries by platform.
Change-Id: I7388b3f5d17e35e55726797ba40631fd8590fb24 Reviewed-on: https://swiftshader-review.googlesource.com/17868 Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index e869116c1..51677326e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,5 +30,5 @@ deploy:
bucket: swiftshader-binaries
skip_cleanup: true
acl: public-read
- upload-dir: Linux
+ upload-dir: OpenGL_ES/Latest
local-dir: $TRAVIS_BUILD_DIR/out \ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c14ef9c3f..ce355c33a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -915,7 +915,7 @@ if(BUILD_EGL)
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:libEGL>/translator
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> $<TARGET_FILE_DIR:libEGL>/translator/${LIB_PREFIX}EGL_translator${CMAKE_SHARED_LIBRARY_SUFFIX}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/out
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> ${CMAKE_SOURCE_DIR}/out/
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> ${CMAKE_SOURCE_DIR}/out/${CMAKE_SYSTEM_NAME}/
)
endif()
@@ -947,7 +947,7 @@ if(BUILD_GLESv2)
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:libGLESv2>/translator
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> $<TARGET_FILE_DIR:libGLESv2>/translator/${LIB_PREFIX}GLES_V2_translator${CMAKE_SHARED_LIBRARY_SUFFIX}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/out
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> ${CMAKE_SOURCE_DIR}/out/
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> ${CMAKE_SOURCE_DIR}/out/${CMAKE_SYSTEM_NAME}/
)
endif()