From 2158acecf4941be566cd599f35a4d69d75989545 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 8 Mar 2018 12:39:40 -0800
Subject: [PATCH] tell cmake we are fine ignoring generated for CMP0071
---
interface/CMakeLists.txt | 11 +++++++----
libraries/render-utils/CMakeLists.txt | 3 +++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 3ed5445493..3d33b9929b 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -318,13 +318,13 @@ if (APPLE)
else()
# copy the resources files beside the executable
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -E copy_if_different
- "${RESOURCES_RCC}"
+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+ "${RESOURCES_RCC}"
"$<TARGET_FILE_DIR:interface>"
# FIXME, the edit script code loads HTML from the scripts folder
# which in turn relies on CSS that refers to the fonts. In theory
- # we should be able to modify the CSS to reference the QRC path to
- # the ttf files, but doing so generates a CORS policy violation,
+ # we should be able to modify the CSS to reference the QRC path to
+ # the ttf files, but doing so generates a CORS policy violation,
# so we have to retain a copy of the fonts outside of the resources binary
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${PROJECT_SOURCE_DIR}/resources/fonts"
@@ -379,3 +379,6 @@ endif()
add_dependency_external_projects(GifCreator)
find_package(GifCreator REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS})
+
+# tell CMake to exclude ui_console.h for policy CMP0071
+set_property(SOURCE ui_console.h PROPERTY SKIP_AUTOMOC ON)
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 7fece45b2f..319b6ad415 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -8,6 +8,9 @@ include_hifi_library_headers(audio)
include_hifi_library_headers(networking)
include_hifi_library_headers(octree)
+# tell CMake to exclude qrc_fonts.cpp for policy CMP0071
+set_property(SOURCE qrc_fonts.cpp PROPERTY SKIP_AUTOMOC ON)
+
if (NOT ANDROID)
target_nsight()
endif ()