livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump cmake version needed up to 3.16 so target_precompile_headers can be 

used.
meow-7.2.2
Nicky 2022-04-09 20:15:07 +02:00
parent 37595f90f9
commit 0980a94341
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/CMakeLists.txt
View File

@ -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.")

12
indra/newview/CMakeLists.txt
View File

@ -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