From 39e6b206eaa1dd1dbe9c31e888884c4d546ea3ab Mon Sep 17 00:00:00 2001 From: ModoX Date: Fri, 4 Oct 2019 15:20:06 +0200 Subject: [PATCH] Add additional cmake option to Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46040c8c26..c9b4d9a4f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ pipeline { string(name: 'USE_SCRIPTPCH', defaultValue: '1', description: 'Build Option USE_SCRIPTPCH') string(name: 'WITH_COREDEBUG', defaultValue: '0', description: 'Build Option WITH_COREDEBUG') string(name: 'CMAKE_BUILD_TYPE', defaultValue: 'RelWithDebInfo', description: 'Build Option CMAKE_BUILD_TYPE') + string(name: 'CMAKE_ADDITIONAL', defaultValue: '', description: 'Additional CMake parameters') } agent { @@ -33,7 +34,7 @@ pipeline { steps { echo 'Building...' dir('build') { - sh "cmake ../git -DCMAKE_INSTALL_PREFIX=../ -DWITH_DYNAMIC_LINKING=${params.WITH_DYNAMIC_LINKING} -DSCRIPTS=${params.SCRIPTS} -DBNETSERVER=${params.BNETSERVER} -DWORLDSERVER=${params.WORLDSERVER} -DTOOLS=${params.TOOLS} -DWITH_WARNINGS=${params.WITH_WARNINGS} -DUSE_COREPCH=${params.USE_COREPCH} -DUSE_SCRIPTPCH=${params.USE_SCRIPTPCH} -DWITH_COREDEBUG=${params.WITH_COREDEBUG} -DCMAKE_BUILD_TYPE=${params.CMAKE_BUILD_TYPE}" + sh "cmake ../git -DCMAKE_INSTALL_PREFIX=../ -DWITH_DYNAMIC_LINKING=${params.WITH_DYNAMIC_LINKING} -DSCRIPTS=${params.SCRIPTS} -DBNETSERVER=${params.BNETSERVER} -DWORLDSERVER=${params.WORLDSERVER} -DTOOLS=${params.TOOLS} -DWITH_WARNINGS=${params.WITH_WARNINGS} -DUSE_COREPCH=${params.USE_COREPCH} -DUSE_SCRIPTPCH=${params.USE_SCRIPTPCH} -DWITH_COREDEBUG=${params.WITH_COREDEBUG} -DCMAKE_BUILD_TYPE=${params.CMAKE_BUILD_TYPE} -DBoost_NO_BOOST_CMAKE=ON ${params.CMAKE_ADDITIONAL}" sh """ set +x