32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 653a089289fe2f45c9d366adf05e90b100c25a47 Mon Sep 17 00:00:00 2001
|
|
From: Alexpux <alexey.pawlow@gmail.com>
|
|
Date: Mon, 3 Aug 2015 22:00:16 +0100
|
|
Subject: [PATCH 3/8] Disable response files for MSYS Generator
|
|
|
|
---
|
|
Modules/Platform/Windows-GNU.cmake | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
|
|
index 22daa6294f..ed5166a519 100644
|
|
--- a/Modules/Platform/Windows-GNU.cmake
|
|
+++ b/Modules/Platform/Windows-GNU.cmake
|
|
@@ -74,9 +74,11 @@ macro(__windows_compiler_gnu lang)
|
|
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
|
|
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "")
|
|
|
|
- set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
|
|
- set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES ${__WINDOWS_GNU_LD_RESPONSE})
|
|
- set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
|
|
+ if(NOT CMAKE_GENERATOR STREQUAL "MSYS Makefiles" OR CMAKE_NEED_RESPONSE)
|
|
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
|
|
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES ${__WINDOWS_GNU_LD_RESPONSE})
|
|
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
|
|
+ endif()
|
|
|
|
# We prefer "@" for response files but it is not supported by gcc 3.
|
|
execute_process(COMMAND ${CMAKE_${lang}_COMPILER} --version OUTPUT_VARIABLE _ver ERROR_VARIABLE _ver)
|
|
--
|
|
2.11.0
|
|
|