diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2019-03-15 18:44:21 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2019-03-15 18:44:21 +0300 |
| commit | a721335be77d439e7c0a22639536f65b74db02d3 (patch) | |
| tree | e017d35335fabb1cecf0fb68703cafe0700ce5ce /Jenkinsfile | |
| parent | 8f2a6bfb59e060d838b24e6f36c2a9ae1984f048 (diff) | |
Also specify path for GMock on Windows to use MinGW
Otherwise the Jenkins instance will take the MSVC version.
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index b8ab466e8..7bc20502f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ parallel_nodes(["linux && cura", "windows && cura"]) { extra_cmake_args = "" if(!isUnix()) { - extra_cmake_args = "-DArcus_DIR=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/cmake/Arcus\" -DGTEST_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgtest.a\" -DGTEST_MAIN_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgtest_main.a\"" + extra_cmake_args = "-DArcus_DIR=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/cmake/Arcus\" -DGTEST_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgtest.a\" -DGTEST_MAIN_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgtest_main.a\" -DGMOCK_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgmock.a\" -DGMOCK_MAIN_LIBRARY=\"${env.CURA_ENVIRONMENT_PATH}/${branch}/lib-mingw/libgmock_main.a\"" } cmake '..', "-DCMAKE_PREFIX_PATH=\"${env.CURA_ENVIRONMENT_PATH}/${branch}\" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON ${extra_cmake_args}" |