[Cmake-commits] [cmake-commits] king committed CMakeParseImplicitLinkInfo.cmake 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jul 28 08:36:14 EDT 2009


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

Modified Files:
	CMakeParseImplicitLinkInfo.cmake 
Log Message:
BUG: Parse implicit link editor -z*extract options

The Sun Fortran compiler passes -zallextract and -zdefaultextract to the
linker so that all objects from one of its archives are included in the
link.  This teaches the implicit options parser to recognize the flags.
We need to pass them explicitly on C++ link lines when Fortran code is
linked.


Index: CMakeParseImplicitLinkInfo.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeParseImplicitLinkInfo.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeParseImplicitLinkInfo.cmake	23 Jul 2009 14:07:18 -0000	1.1
--- CMakeParseImplicitLinkInfo.cmake	28 Jul 2009 12:36:11 -0000	1.2
***************
*** 26,30 ****
      endif()
      if("${cmd}" MATCHES "${linker_regex}")
!       string(REGEX REPLACE ";-([LY]);" ";-\\1" args "${args}")
        foreach(arg IN LISTS args)
          if("${arg}" MATCHES "^-L(.:)?[/\\]")
--- 26,30 ----
      endif()
      if("${cmd}" MATCHES "${linker_regex}")
!       string(REGEX REPLACE ";-([LYz]);" ";-\\1" args "${args}")
        foreach(arg IN LISTS args)
          if("${arg}" MATCHES "^-L(.:)?[/\\]")
***************
*** 47,50 ****
--- 47,53 ----
            # HP named library.
            list(APPEND implicit_libs ${arg})
+         elseif("${arg}" MATCHES "^-z(all|default|weak)extract")
+           # Link editor option.
+           list(APPEND implicit_libs ${arg})
          endif()
        endforeach()



More information about the Cmake-commits mailing list