[Opensync-commits] r5886 - branches/3rd-party-cmake-modules/modules

[<svn...@op...>]

Author: henrik
Date: Thu Oct 22 17:20:12 2009
New Revision: 5886
URL: http://www.opensync.org/changeset/5886

Log:
Look also for thunderbird/nspr in incude directories. Add nspr4 libraries under Windows

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	Thu Oct 22 17:18:43 2009	(r5885)
+++ branches/3rd-party-cmake-modules/modules/FindThunderbirdXpcom.cmake	Thu Oct 22 17:20:12 2009	(r5886)
@@ -42,7 +42,7 @@
 		MESSAGE ( FATAL_ERROR "*** *** Did not find Thunderbird include directory with mozilla-config.h" )
 	ENDIF ( NOT THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR )
 	FIND_PATH ( NSPR_MAIN_INCLUDE_DIR nspr.h
-		PATH_SUFFIXES nspr nspr4
+		PATH_SUFFIXES nspr nspr4 thunderbird/nspr
 		PATHS
 		/opt/local/include/
 		/sw/include/
@@ -124,6 +124,9 @@
 # Thunderbird 3
 IF ( THUNDERBIRD_VERSION_MAIN STREQUAL "3" )
 	SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcomglue_s;xpcom" )
+	IF ( WIN32 )
+		SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcomglue_s;xpcom;nspr4" )
+	ENDIF ( WIN32 )
 ENDIF ( THUNDERBIRD_VERSION_MAIN STREQUAL "3" )
 
 # So, by now we should have the following variables set: