summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-19 12:51:39 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-06-19 12:51:39 (GMT)
commitea69c7cb962c61e6cb1ef339a83f9f17a7ed370d (patch)
tree7ee7f318d85950e3eaa9c6ae03deaeb9d6cd315b
parent66a2675e2bd4e32c32ff8e4147c3c679734c4445 (diff)
parent078b60f05c9750b79e0efb322fafeddd8450f6c0 (diff)
downloadCMake-ea69c7cb962c61e6cb1ef339a83f9f17a7ed370d.zip
CMake-ea69c7cb962c61e6cb1ef339a83f9f17a7ed370d.tar.gz
CMake-ea69c7cb962c61e6cb1ef339a83f9f17a7ed370d.tar.bz2
Merge topic 'Embarcadero-ninja-link-pool'
078b60f0 Embarcadero: Run at most one linker invocation at a time (#15620)
-rw-r--r--Modules/Platform/Windows-Embarcadero.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake
index 26b3c0c..58ef3ca 100644
--- a/Modules/Platform/Windows-Embarcadero.cmake
+++ b/Modules/Platform/Windows-Embarcadero.cmake
@@ -74,6 +74,12 @@ set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT})
set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT})
+# The Borland link tool does not support multiple concurrent
+# 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)
+endif()
macro(__embarcadero_language lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_DLL "${_tD}") # Note: This variable is a ';' separated list