2011-01-03 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Darin Adler.

        [WINCE] Provide third party directory via environment variable
        https://bugs.webkit.org/show_bug.cgi?id=51643

        * Source/cmake/OptionsWinCE.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b0d9f75c504fba2d232e250486bda0cf403d7749..cd72bd77989a64a2e190d0cfb2e45591a722d8d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-03  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        [WINCE] Provide third party directory via environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=51643
+
+        * Source/cmake/OptionsWinCE.cmake:
+
 2011-01-03  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Martin Robinson.

diff --git a/Source/cmake/OptionsWinCE.cmake b/Source/cmake/OptionsWinCE.cmake
index 788453061c2548eed1695e0c5de8163916a17853..55f8caa96c29a85ceb11def017689c03692f787d 100644 (file)
--- a/Source/cmake/OptionsWinCE.cmake
+++ b/Source/cmake/OptionsWinCE.cmake
@@ -10,7 +10,11 @@ ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
 ADD_DEFINITIONS(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000)
 
 IF (NOT 3RDPARTY_DIR)
-    MESSAGE(FATAL_ERROR "You must provide a 3rd party directory for WinCE port.")
+    IF (EXISTS $ENV{WEBKITTHIRDPARTYDIR})
+        SET(3RDPARTY_DIR $ENV{WEBKITTHIRDPARTYDIR})
+    ELSE ()
+        MESSAGE(FATAL_ERROR "You must provide a third party directory for WinCE port.")
+    ENDIF ()
 ENDIF ()
 
 INCLUDE_DIRECTORIES(${3RDPARTY_DIR}/ce-compat)