From: <svn...@op...> - 2009-03-17 12:51:58
|
Author: henrik Date: Tue Mar 17 13:51:16 2009 New Revision: 5293 URL: http://www.opensync.org/changeset/5293 Log: Link libxpcomglue_s for Thunderbird 3 Modified: branches/3rd-party-cmake-modules/modules/FindThunderbirdXpcom.cmake Modified: branches/3rd-party-cmake-modules/modules/FindThunderbirdXpcom.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindThunderbirdXpcom.cmake Tue Mar 17 12:10:16 2009 (r5292) +++ branches/3rd-party-cmake-modules/modules/FindThunderbirdXpcom.cmake Tue Mar 17 13:51:16 2009 (r5293) @@ -75,6 +75,30 @@ # Usually the only library we need is the xpcom SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcom" ) + + # For Thunderbird 3.0 we need to link the glue library + EXEC_PROGRAM ( thunderbird ARGS "--version" + OUTPUT_VARIABLE _THUNDERBIRD_VERSION + RETURN_VALUE _THUNDERBIRD_VERSION_RET ) + + IF ( _THUNDERBIRD_VERSION_RET ) + EXEC_PROGRAM ( icedove ARGS "--version" + OUTPUT_VARIABLE _THUNDERBIRD_VERSION + RETURN_VALUE _THUNDERBIRD_VERSION_RET ) + ENDIF ( _THUNDERBIRD_VERSION_RET ) + + IF ( NOT _THUNDERBIRD_VERSION_RET ) + + STRING ( REGEX MATCH ".*([0-9]\\.[0-9]).*" _THUNDERBIRD_VERSION_OK "${_THUNDERBIRD_VERSION}" ) + IF ( _THUNDERBIRD_VERSION_OK ) + STRING ( REGEX REPLACE ".*([0-9]\\.[0-9]).*" "\\1" THUNDERBIRD_VERSION "${_THUNDERBIRD_VERSION}" ) + MESSAGE ( STATUS "THUNDERBIRD_VERSION [${THUNDERBIRD_VERSION}]" ) + IF ( THUNDERBIRD_VERSION STREQUAL "3.0" ) + SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcomglue_s;xpcom" ) + ENDIF ( THUNDERBIRD_VERSION STREQUAL "3.0" ) + ENDIF ( _THUNDERBIRD_VERSION_OK ) + ENDIF ( NOT _THUNDERBIRD_VERSION_RET ) + ENDIF( THUNDERBIRD_XPCOM_FOUND ) # So, by now we should have the following variables set: |