diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-05-31 21:26:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-31 21:26:50 +0200 |
| commit | 8b0b80000818199ea623897b1ad3705b657983c6 (patch) | |
| tree | d52100871d18e4e296c9ecf1592be0a1e175cfd3 | |
| parent | Resolve IPO flags mismatch (diff) | |
| download | cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar.gz cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar.bz2 cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar.lz cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar.xz cuberite-8b0b80000818199ea623897b1ad3705b657983c6.tar.zst cuberite-8b0b80000818199ea623897b1ad3705b657983c6.zip | |
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | travisbuild.sh | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c16c0e40..6b0ce4afa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,11 +97,11 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -# The need for speed (in Release) -include(CheckIPOSupported) -check_ipo_supported(RESULT IPO_SUPPORTED) -if(IPO_SUPPORTED) - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) +# The need for speed (in Release): +if(WHOLE_PROGRAM_OPTIMISATION) + include(CheckIPOSupported) + check_ipo_supported(RESULT IPO_SUPPORTED) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ${IPO_SUPPORTED}) endif() # Static CRT diff --git a/travisbuild.sh b/travisbuild.sh index 5c4a559bb..d1a535e72 100755 --- a/travisbuild.sh +++ b/travisbuild.sh @@ -20,12 +20,13 @@ if [ `which ccache` ]; then ccache -z # Zero statistics fi -# Work around a Clang + ccache issue with failing -# builds by disabling precompiled headers +# Work around a Clang + ccache issue with failing builds by disabling +# precompiled headers. Turn off LTO for faster build speeds cmake . -DBUILD_TOOLS=YES \ -DPRECOMPILE_HEADERS=NO \ -DUNITY_BUILDS=${TRAVIS_CUBERITE_UNITY_BUILDS-YES} \ -DSELF_TEST=YES \ + -DWHOLE_PROGRAM_OPTIMISATION=No \ ${CACHE_ARGS}; echo "Building..." |