From aa7467c37ec3337cca730787bda5b8fb481bf4c4 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 13 Jul 2015 16:24:37 +0200
Subject: [PATCH] Workaround for
https://issues.jenkins-ci.org/browse/JENKINS-29329.
---
scripts/cmake/CMakeSetup.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 5280ca710aa..eec1f587ff4 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -26,6 +26,10 @@ endif()
if($ENV{CI})
set(OGS_VERSION 6.6.6) # Dummy version for CI-environment (Travis) or subproject
+ # Workaround for https://issues.jenkins-ci.org/browse/JENKINS-29329
+ if(MSVC)
+ set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM} CACHE FILEPATH "workaround for jenkins cmake-plugin")
+ endif()
elseif(IS_SUBPROJECT)
set(OGS_VERSION x.x.x)
else()
--
GitLab