Auto stash before merge of "master" and "origin/master"

InfiniBrains · Nov 23, 2022 · 0b15292 · 0b15292
1 parent b58395b
commit 0b15292
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/core2/CMakeLists.txt b/core2/CMakeLists.txt
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -1,3 +1,4 @@
+include(filament.cmake)
 if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)

diff --git a/external/filament.cmake b/external/filament.cmake
@@ -0,0 +1,12 @@
+# https://github.com/google/filament.git
+#SET(ENABLE_PCH OFF CACHE BOOL "ENABLE_PCH")
+SET_PROPERTY(GLOBAL PROPERTY SKIP_PRECOMPILE_HEADERS ON)
+SET_PROPERTY(GLOBAL PROPERTY DISABLE_PRECOMPILE_HEADERS ON)
+CPMAddPackage(GITHUB_REPOSITORY google/filament
+        GIT_TAG v1.29.0
+        OPTIONS "ENABLE_PCH OFF" "ENABLE_OPT OFF"
+        )
+find_package(filament REQUIRED)
+IF(filament_ADDED)
+    MESSAGE(STATUS filament_ADDED)
+ENDIF()