diff options
| author | James Johnston <johnstonj.public@codenest.com> | 2015-12-03 19:10:19 (GMT) |
|---|---|---|
| committer | James Johnston <johnstonj.public@codenest.com> | 2015-12-03 19:10:19 (GMT) |
| commit | ddbda72288f022fa558d8253c8894687634448c1 (patch) | |
| tree | 89e160470038eefc85b64dc8390275ec11587453 | |
| parent | 4ffeab0e3c451854a4a9d424b47b2179c6cf6c6b (diff) | |
| download | CMake-ddbda72288f022fa558d8253c8894687634448c1.zip CMake-ddbda72288f022fa558d8253c8894687634448c1.tar.gz CMake-ddbda72288f022fa558d8253c8894687634448c1.tar.bz2 | |
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.
| -rw-r--r-- | Modules/Platform/Windows-Embarcadero.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake index 5295a48e..102e3a6 100644 --- a/Modules/Platform/Windows-Embarcadero.cmake +++ b/Modules/Platform/Windows-Embarcadero.cmake @@ -78,7 +78,11 @@ set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_R # invocations within a single working directory. if(NOT DEFINED CMAKE_JOB_POOL_LINK) set(CMAKE_JOB_POOL_LINK BCC32LinkPool) - set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1) + get_property(_bccjp GLOBAL PROPERTY JOB_POOLS) + if(NOT _bccjp MATCHES "BCC32LinkPool=") + set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1) + endif() + unset(_bccjp) endif() macro(__embarcadero_language lang) |