diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-27 14:39:55 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-27 14:39:55 -0500 |
| commit | dd2f81491e6e17681dd18882a8ccfa01fa32a3f7 (patch) | |
| tree | 6b782de32aeb462333d70747f269b1725e723e00 /Modules/CMakeDetermineCompilerABI.cmake | |
| parent | 949d32c3067830a1376950fc78dbcde39bc378a8 (diff) | |
| parent | 7679f9fab099e729b61320927a9e0b8d03546f7f (diff) | |
| download | cmake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.tar.gz | |
Merge branch 'dev/add_test-working-directory' into dev/strict-mode
Conflicts:
Tests/CMakeLists.txt
Diffstat (limited to 'Modules/CMakeDetermineCompilerABI.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 81ec71ccd7..7f918e6df0 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -78,7 +78,8 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ABI lang src) AND NOT MULTI_ARCH # Skip this with Xcode for now. AND NOT "${CMAKE_GENERATOR}" MATCHES Xcode) - CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs log) + CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs log + "${CMAKE_${lang}_IMPLICIT_OBJECT_REGEX}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Parsed ${lang} implicit link information from above output:\n${log}\n\n") ENDIF() |