Make CMake 3.10 the minimum version, add LTO option (google#1316)

* Make CMake 3.10 the minimum version, add LTO option * Install a newer CMake on Linux CI builds * Update LLVM and Cmake on Windows CI * Update build/windows/ci-common.bat Co-Authored-By: Ben Doherty <[email protected]> * Update formatting * Apply suggestions from code review * Update build/windows/ci-common.bat * Update CMake * Switch Android projects back to CMake 3.6
daichen · Jun 19, 2019 · b124216 · b124216
1 parent 8cd44fb
commit b124216
Show file tree

Hide file tree

Showing 68 changed files with 105 additions and 79 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # ==================================================================================================
 # CMake
 # ==================================================================================================
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 
 # ==================================================================================================
 # Project declaration
@@ -18,6 +18,8 @@ option(USE_EXTERNAL_GLES3 "Experimental: Compile Filament against OpenGL ES 3" O
 
 option(GENERATE_JS_DOCS "Build WebGL documentation and tutorials" OFF)
 
+option(ENABLE_LTO "Enable link-time optimizations if supported by the compiler" OFF)
+
 # ==================================================================================================
 # OS specific
 # ==================================================================================================
@@ -101,7 +103,7 @@ set(TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/tools)
 # ==================================================================================================
 # Compiler check
 # ==================================================================================================
-set(MIN_CLANG_VERSION "5.0")
+set(MIN_CLANG_VERSION "6.0")
 
 if (CMAKE_C_COMPILER_ID MATCHES "Clang")
     if (CMAKE_C_COMPILER_VERSION VERSION_LESS MIN_CLANG_VERSION)
@@ -124,6 +126,20 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND "${CMAKE_CXX_SIMULATE_ID}" S
     set(CLANG_CL true)
 endif()
 
+# ==================================================================================================
+# Link time optimizations (LTO)
+# ==================================================================================================
+if (ENABLE_LTO)
+    include(CheckIPOSupported)
+
+    check_ipo_supported(RESULT IPO_SUPPORT)
+
+    if (IPO_SUPPORT)
+        message(STATUS "LTO support is enabled")
+        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    endif()
+endif()
+
 # ==================================================================================================
 # General compiler flags
 # ==================================================================================================

diff --git a/android/filamat-android/CMakeLists.txt b/android/filamat-android/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
 
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})
 

diff --git a/android/filament-android/CMakeLists.txt b/android/filament-android/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
 
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})
 

diff --git a/android/gltfio-android/CMakeLists.txt b/android/gltfio-android/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
 
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})
 

diff --git a/build/linux/ci-common.sh b/build/linux/ci-common.sh
@@ -18,18 +18,18 @@ if [[ "$KOKORO_BUILD_ID" ]]; then
     if [[ "$FILAMENT_ANDROID_CI_BUILD" ]]; then
         # Update NDK
         yes | $ANDROID_HOME/tools/bin/sdkmanager "ndk-bundle" > /dev/null
+    fi
 
-        # Install CMake
-        mkdir -p cmake
-        cd cmake
+    # Install CMake
+    mkdir -p cmake
+    cd cmake
 
-        sudo wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh
-        sudo chmod +x ./cmake-$CMAKE_VERSION-Linux-x86_64.sh
-        sudo ./cmake-$CMAKE_VERSION-Linux-x86_64.sh --skip-license > /dev/null
-        sudo update-alternatives --install /usr/bin/cmake cmake `pwd`/bin/cmake 1000 --force
+    sudo wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh
+    sudo chmod +x ./cmake-$CMAKE_VERSION-Linux-x86_64.sh
+    sudo ./cmake-$CMAKE_VERSION-Linux-x86_64.sh --skip-license > /dev/null
+    sudo update-alternatives --install /usr/bin/cmake cmake `pwd`/bin/cmake 1000 --force
 
-        cd ..
-    fi
+    cd ..
 
     # Install clang
     # This may or may not be needed...

diff --git a/build/windows/ci-common.bat b/build/windows/ci-common.bat
@@ -1,13 +1,23 @@
 if defined KOKORO_BUILD_ID (
-    choco install llvm --version 6.0.1 -y
+    choco install cmake -y
 
     :: retry if choco install failed
     if errorlevel 1 (
-        choco install llvm --version 6.0.1 -y
+        choco install cmake -y
         if errorlevel 1 exit /b %errorlevel%
     )
 
-    :: refreshenv is necessary to put LLVM on path
+    refreshenv
+
+    choco install llvm --version 8.0.0 -y
+
+    :: retry if choco install failed
+    if errorlevel 1 (
+        choco install llvm --version 8.0.8 -y
+        if errorlevel 1 exit /b %errorlevel%
+    )
+
+    :: refreshenv is necessary to put CMake and LLVM on path
     refreshenv
 )
 

diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament C ASM)
 
 set(TARGET filament)

diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament C ASM)
 
 set(TARGET backend)

diff --git a/filament/benchmark/CMakeLists.txt b/filament/benchmark/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament-benchmarks)
 
 # ==================================================================================================

diff --git a/filament/test/CMakeLists.txt b/filament/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament-tests)
 
 # ==================================================================================================

diff --git a/filament/tools/CMakeLists.txt b/filament/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(ssaogen)
 
 set(TARGET ssaogen)

diff --git a/java/filamat/CMakeLists.txt b/java/filamat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament-java)
 
 if (NOT ENABLE_JAVA)

diff --git a/java/filament/CMakeLists.txt b/java/filament/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament-java)
 
 if (NOT ENABLE_JAVA)

diff --git a/libs/bluegl/CMakeLists.txt b/libs/bluegl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(bluegl ASM)
 
 set(TARGET              bluegl)

diff --git a/libs/bluevk/CMakeLists.txt b/libs/bluevk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(bluevk)
 
 set(TARGET              bluevk)

diff --git a/libs/filabridge/CMakeLists.txt b/libs/filabridge/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filabridge)
 
 set(TARGET         filabridge)

diff --git a/libs/filaflat/CMakeLists.txt b/libs/filaflat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filaflat)
 
 set(TARGET         filaflat)

diff --git a/libs/filagui/CMakeLists.txt b/libs/filagui/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filagui)
 
 set(TARGET filagui)

diff --git a/libs/filamat/CMakeLists.txt b/libs/filamat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filamat)
 
 set(TARGET         filamat)

diff --git a/libs/filameshio/CMakeLists.txt b/libs/filameshio/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filameshio)
 
 set(TARGET filameshio)

diff --git a/libs/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(geometry)
 
 set(TARGET geometry)

diff --git a/libs/gltfio/CMakeLists.txt b/libs/gltfio/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(gltfio C ASM)
 
 set(TARGET gltfio)

diff --git a/libs/ibl/CMakeLists.txt b/libs/ibl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(cmgen)
 
 set(TARGET ibl)

diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(image)
 
 set(TARGET image)

diff --git a/libs/imageio/CMakeLists.txt b/libs/imageio/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(imageio)
 
 set(TARGET imageio)

diff --git a/libs/math/CMakeLists.txt b/libs/math/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(math)
 
 set(TARGET math)

diff --git a/libs/rays/CMakeLists.txt b/libs/rays/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(rays)
 
 set(TARGET rays)

diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(utils)
 
 set(TARGET utils)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(filament-samples C ASM)
 
 set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/shaders/CMakeLists.txt b/shaders/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(shaders C ASM)
 
 set(TARGET shaders)

diff --git a/third_party/OpenImageDenoise/CMakeLists.txt b/third_party/OpenImageDenoise/CMakeLists.txt
@@ -14,7 +14,7 @@
 ## limitations under the License.                                           ##
 ## ======================================================================== ##
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 
 set(OIDN_VERSION_MAJOR 0)
 set(OIDN_VERSION_MINOR 9)

diff --git a/third_party/OpenImageDenoise/tnt/CMakeLists.txt b/third_party/OpenImageDenoise/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(OIDN_VERSION_MAJOR 0)

diff --git a/third_party/astcenc/tnt/CMakeLists.txt b/third_party/astcenc/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(astcenc)
 
 set(TARGET astcenc)

diff --git a/third_party/benchmark/tnt/CMakeLists.txt b/third_party/benchmark/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(benchmark)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/cgltf/tnt/CMakeLists.txt b/third_party/cgltf/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(cgltf)
 
 set(TARGET cgltf)

diff --git a/third_party/etc2comp/CMakeLists.txt b/third_party/etc2comp/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.10)
 project(EtcTest)
 
 set (CMAKE_CXX_STANDARD 11)

diff --git a/third_party/getopt/CMakeLists.txt b/third_party/getopt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(getopt)
 
 set(TARGET getopt)

diff --git a/third_party/glslang/tnt/CMakeLists.txt b/third_party/glslang/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # Adhere to GNU filesystem layout conventions

diff --git a/third_party/imgui/tnt/CMakeLists.txt b/third_party/imgui/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(imgui)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/libassimp/tnt/CMakeLists.txt b/third_party/libassimp/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(assimp)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/libgtest/tnt/CMakeLists.txt b/third_party/libgtest/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(gtest)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/libpng/tnt/CMakeLists.txt b/third_party/libpng/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(png)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/libsdl2/tnt/CMakeLists.txt b/third_party/libsdl2/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(sdl2 C)
 
 # This is necessary on Windows, so the sdl2.dll lives next to the sample apps that use it

diff --git a/third_party/libz/tnt/CMakeLists.txt b/third_party/libz/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(z)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/meshoptimizer/CMakeLists.txt b/third_party/meshoptimizer/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(meshoptimizer)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 option(BUILD_DEMO "Build demo" OFF)
 

diff --git a/third_party/robin-map/tnt/CMakeLists.txt b/third_party/robin-map/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(tsl)
 
 set(TARGET tsl)

diff --git a/third_party/skylight/tnt/CMakeLists.txt b/third_party/skylight/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(skylight)
 
 set(OUR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)

diff --git a/third_party/smol-v/tnt/CMakeLists.txt b/third_party/smol-v/tnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(smol-v)
 
 set(TARGET smol-v)

diff --git a/third_party/spirv-cross/tnt/CMakeLists.txt b/third_party/spirv-cross/tnt/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
 project(SPIRV-Cross)
 
 # Use assertions instead of exceptions so we can succesfully compile with -fno-exceptions.

diff --git a/third_party/spirv-tools/CMakeLists.txt b/third_party/spirv-tools/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
 endif()