[Cmake-commits] [cmake-commits] king committed KDE3Macros.cmake 1.9 1.10

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 13 13:54:37 EST 2010


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

Modified Files:
	KDE3Macros.cmake 
Log Message:
Fix KDE3 .la file format on Cygwin

We teach KDE3Macros.cmake to generate .la files on Cygwin that match
those produced by libtool.  See issue #10122.


Index: KDE3Macros.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/KDE3Macros.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** KDE3Macros.cmake	28 Sep 2009 15:46:50 -0000	1.9
--- KDE3Macros.cmake	13 Jan 2010 18:54:34 -0000	1.10
***************
*** 323,327 ****
     FILE(APPEND ${_laname} "dlname='${_soname}'\n")
     FILE(APPEND ${_laname} "# Names of this library\n")
!    FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
     FILE(APPEND ${_laname} "# The name of the static archive\n")
     FILE(APPEND ${_laname} "old_library=''\n")
--- 323,331 ----
     FILE(APPEND ${_laname} "dlname='${_soname}'\n")
     FILE(APPEND ${_laname} "# Names of this library\n")
!    IF(CYGWIN)
!      FILE(APPEND ${_laname} "library_names='${_soname}'\n")
!    ELSE(CYGWIN)
!      FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
!    ENDIF(CYGWIN)
     FILE(APPEND ${_laname} "# The name of the static archive\n")
     FILE(APPEND ${_laname} "old_library=''\n")



More information about the Cmake-commits mailing list