From b9e5afd98d64b9e70cf733bb7ed2400f1b5708a6 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 27 Mar 2020 08:43:57 +0100 Subject: [PATCH 1/2] Change Packaging flag in yml for Windows [ci skip] --- .gitlab-ci-files/job-windows-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index be904b705..ce0c411c9 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -125,7 +125,7 @@ job-windows-vs2017-package: #this wrapper relays only needed calls to the real compiler #cache stats display - C:\PROGRA~1\Python37\Scripts\cl -s - - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% + - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_APP_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - C:\PROGRA~1\Python37\Scripts\cl -s - mkdir "%CI_PROJECT_DIR%/results" From bcfe050cf0ec564066a195bdfe15a21d918cc48b Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 27 Mar 2020 08:44:24 +0100 Subject: [PATCH 2/2] Change Packaging flag in yml for Mac [ci skip] --- .gitlab-ci-files/job-macosx-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 6813a89d5..0a5a4fa32 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -84,7 +84,7 @@ job-macosx-makefile-package: variables: - $NIGHTLY_MASTER variables: - CMAKE_OPTIONS: -DENABLE_PACKAGING=YES + CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES extends: job-macosx-makefile script: - *build_all_script