[Cmake-commits] [cmake-commits] king committed CMakeDetermineCompilerABI.cmake 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23629/Modules

Modified Files:
	CMakeDetermineCompilerABI.cmake 
Log Message:
Skip implicit link info for multiple OS X archs

Implicit link information contains architecture-specific libraries and
directories.  The link information cannot be explicitly specified safely
when CMAKE_OSX_ARCHITECTURES contains more than one architecture.

As a result, we currently cannot support mixed-language C++/Fortran
targets and OS X universal binaries simultaneously.  In order to avoid
conflicts for simple C/C++ cases, we now simply skip detection of
implicit link information in this case.


Index: CMakeDetermineCompilerABI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerABI.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeDetermineCompilerABI.cmake	23 Jul 2009 20:19:29 -0000	1.4
--- CMakeDetermineCompilerABI.cmake	22 Sep 2009 20:02:39 -0000	1.5
***************
*** 46,53 ****
  
        # Parse implicit linker information for this language, if available.
-       # Skip this with Xcode for now.
        SET(implicit_dirs "")
        SET(implicit_libs "")
!       IF(CMAKE_${lang}_VERBOSE_FLAG AND NOT "${CMAKE_GENERATOR}" MATCHES Xcode)
          CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs)
        ENDIF()
--- 46,57 ----
  
        # Parse implicit linker information for this language, if available.
        SET(implicit_dirs "")
        SET(implicit_libs "")
!       IF(CMAKE_${lang}_VERBOSE_FLAG
!           # Implicit link information cannot be used explicitly for
!           # multiple OS X architectures, so we skip it.
!           AND NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES ";"
!           # Skip this with Xcode for now.
!           AND NOT "${CMAKE_GENERATOR}" MATCHES Xcode)
          CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs)
        ENDIF()