kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Embarcadero: Fix bug where duplicate Ninja job pools would be created. 

If the platform file was included multiple times, it was possible that
duplicate Ninja job pools would be created.
This commit is contained in:
James Johnston 2015-12-03 19:10:19 +00:00
parent 4ffeab0e3c
commit ddbda72288
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/Windows-Embarcadero.cmake
View File

@ -78,8 +78,12 @@ set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_R
# invocations within a single working directory. # invocations within a single working directory.
if(NOT DEFINED CMAKE_JOB_POOL_LINK) if(NOT DEFINED CMAKE_JOB_POOL_LINK)
set(CMAKE_JOB_POOL_LINK BCC32LinkPool) set(CMAKE_JOB_POOL_LINK BCC32LinkPool)
get_property(_bccjp GLOBAL PROPERTY JOB_POOLS)
if(NOT _bccjp MATCHES "BCC32LinkPool=")
set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1) set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1)
endif() endif()
unset(_bccjp)
endif()
macro(__embarcadero_language lang) macro(__embarcadero_language lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_DLL "${_tD}") # Note: This variable is a ';' separated list set(CMAKE_${lang}_COMPILE_OPTIONS_DLL "${_tD}") # Note: This variable is a ';' separated list