Merge d07656b into 4029526

mavlink · Aug 19, 2018 · 495cf1c · 495cf1c
2 parents 4029526 + d07656b
commit 495cf1c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,7 @@ include(cmake/tinyxml2.cmake)
 include(cmake/zlib.cmake)
 
 if(NOT MSVC)
+    cmake_policy(SET CMP0058 NEW)
     include(third_party/cpp_rsc/cmake/modules/cpp_resource.cmake)
     if(NOT ANDROID AND NOT IOS)
         # If not cross-compiling, we can build cpp_rsc.

diff --git a/cmake/embed_files.cmake b/cmake/embed_files.cmake