summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2020-05-26 13:16:37 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2020-05-26 16:50:16 (GMT)
commit9893e159cc0f9ae61dc205d52192e1d1fe1ab532 (patch)
tree6a9973e484ccf0fec3ce9fa10ae04d386b712500
parente0b9e8fba872cdde43d7e7fa1cab626ee446fd2b (diff)
downloadCMake-9893e159cc0f9ae61dc205d52192e1d1fe1ab532.zip
CMake-9893e159cc0f9ae61dc205d52192e1d1fe1ab532.tar.gz
CMake-9893e159cc0f9ae61dc205d52192e1d1fe1ab532.tar.bz2
ci: support setting the generator platform and toolset
-rw-r--r--.gitlab/ci/gitlab_ci.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake
index 29d792f..e9c9f80 100644
--- a/.gitlab/ci/gitlab_ci.cmake
+++ b/.gitlab/ci/gitlab_ci.cmake
@@ -37,6 +37,14 @@ if (NOT CTEST_CMAKE_GENERATOR)
set(CTEST_CMAKE_GENERATOR "Ninja")
endif ()
+# Set the toolset and platform if requested.
+if (NOT "$ENV{CMAKE_GENERATOR_PLATFORM}" STREQUAL "")
+ set(CTEST_CMAKE_GENERATOR_PLATFORM "$ENV{CMAKE_GENERATOR_PLATFORM}")
+endif ()
+if (NOT "$ENV{CMAKE_GENERATOR_TOOLSET}" STREQUAL "")
+ set(CTEST_CMAKE_GENERATOR_TOOLSET "$ENV{CMAKE_GENERATOR_TOOLSET}")
+endif ()
+
# Determine the track to submit to.
set(ctest_track "Experimental")
if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")