diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-09 20:15:07 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-09 20:15:07 +0200 |
| commit | 0980a943413dadb0d77f36798f1dd5347994da74 (patch) | |
| tree | ae420bca313ddec8c0131faf4d78da7ae4048ada | |
| parent | 37595f90f9f45efc27409795a9b8c21486518882 (diff) | |
Bump cmake version needed up to 3.16 so target_precompile_headers can be
used.
| -rw-r--r-- | indra/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 08599b29e0..d06ea58549 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -5,7 +5,8 @@ # with the version specified ## 3.8 added VS_DEBUGGER_WORKING_DIRECTORY support # 3.13/12 is needed for add_link_options/add_compile_definitions -cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR) +# 3.16 is needed for target_precompile_headers +cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e213087f40..faee40e319 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1454,11 +1454,7 @@ if (WINDOWS) # All sources added to viewer_SOURCE_FILES # at this point use it. if(USE_PRECOMPILED_HEADERS) - set_source_files_properties(llviewerprecompiledheaders.cpp - PROPERTIES - COMPILE_FLAGS "/Ycllviewerprecompiledheaders.h" - ) - set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp) + set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp) endif(USE_PRECOMPILED_HEADERS) # Replace the icons with the appropriate ones for the channel @@ -1742,11 +1738,7 @@ if (WINDOWS) ) if(USE_PRECOMPILED_HEADERS) - set_target_properties( - ${VIEWER_BINARY_NAME} - PROPERTIES - COMPILE_FLAGS "/Yullviewerprecompiledheaders.h" - ) + target_precompile_headers( ${VIEWER_BINARY_NAME} PRIVATE llviewerprecompiledheaders.h ) endif(USE_PRECOMPILED_HEADERS) # If adding a file to viewer_manifest.py in the WindowsManifest.construct() method, be sure to add the dependency |