GitLab CI: Disable LTO on Windows

`cmake -DENABLE_LTO=off ..` builds more quickly here, so add it to
merge-req:windows.

Fix a typo.
This commit is contained in:
Gerald Combs 2020-12-12 15:29:05 -08:00
parent 504f2ea42a
commit b63692e327
2 changed files with 2 additions and 2 deletions

View File

@ -333,7 +333,7 @@ merge-req:windows:
- perl tools/make-version.pl --set-release
- mkdir build
- cd build
- cmake -G "Visual Studio 16 2019" -A x64 ..
- cmake -G "Visual Studio 16 2019" -A x64 -DENABLE_LTO=off ..
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" test-programs.vcxproj
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose

View File

@ -71,7 +71,7 @@ endif()
if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
message(STATUS "LTO/IPO is enabled")
else()
message(STATUS "LTO/LPO is not enabled")
message(STATUS "LTO/IPO is not enabled")
endif()
# If our target platform is enforced by our generator, set