birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ninja compile and link pool CMake settings (#2334)

Browse Source 
* Ninja compile and link pool CMake settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>

* Added CMake cached variables for Ninja compile/link pool settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>
This commit is contained in:
L4stR1t3s
2021-07-22 01:04:01 +02:00
committed by GitHub
parent 9596aa0ddf
commit cf2effc58c
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Common/Configurations_common.cmake
+15
View File
@@ -47,3 +47,18 @@ ly_append_configurations_options(
NDEBUG NDEBUG
AZ_BUILD_CONFIGURATION_TYPE="${LY_BUILD_CONFIGURATION_TYPE_RELEASE}" AZ_BUILD_CONFIGURATION_TYPE="${LY_BUILD_CONFIGURATION_TYPE_RELEASE}"
) )
# Ninja: parallel compile and link pool settings
if(CMAKE_GENERATOR MATCHES "Ninja")
set(LY_PARALLEL_COMPILE_JOBS "" CACHE STRING "Number of compile jobs to use (Defaults to not set)")
set(LY_PARALLEL_LINK_JOBS "" CACHE STRING "Number of link jobs to use (Defaults to not set)")
if(LY_PARALLEL_COMPILE_JOBS)
set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LY_PARALLEL_COMPILE_JOBS})
ly_set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
endif()
if(LY_PARALLEL_LINK_JOBS)
set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LY_PARALLEL_LINK_JOBS})
ly_set(CMAKE_JOB_POOL_LINK link_job_pool)
endif()
endif()
cmake/Platform/Linux/Configurations_linux.cmake
-7
View File
@@ -29,10 +29,3 @@ endif()
ly_set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) ly_set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
ly_set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) ly_set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
ly_set(CMAKE_INSTALL_RPATH "$ORIGIN") ly_set(CMAKE_INSTALL_RPATH "$ORIGIN")
if(CMAKE_GENERATOR MATCHES "Ninja")
if(LY_PARALLEL_LINK_JOBS)
set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LY_PARALLEL_LINK_JOBS})
ly_set(CMAKE_JOB_POOL_LINK link_job_pool)
endif()
endif()