From: kubo@profusion.mobi <kubo@profusion.mobi@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 9 Jan 2012 19:17:11 +0000 (+0000)
Subject: [CMake] Clean up some cruft from WTF's CMakeLists.txt
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=29ba57b86d03cf2586d879dd93e752b246ea9893;ds=sidebyside

[CMake] Clean up some cruft from WTF's CMakeLists.txt
https://bugs.webkit.org/show_bug.cgi?id=75420

Reviewed by Daniel Bates.

* wtf/CMakeLists.txt: Remove the unused WTF_PORT_FLAGS variable; add
all needed paths to WTF_INCLUDE_DIRECTORIES in a single place.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 84d87c89de6f..b490712d2054 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-01-01  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Clean up some cruft from WTF's CMakeLists.txt
+        https://bugs.webkit.org/show_bug.cgi?id=75420
+
+        Reviewed by Daniel Bates.
+
+        * wtf/CMakeLists.txt: Remove the unused WTF_PORT_FLAGS variable; add
+        all needed paths to WTF_INCLUDE_DIRECTORIES in a single place.
+
 2012-01-08  Xianzhu Wang  <wangxianzhu@chromium.org>
 
         Fix compilation error about ListHashSetReverseIterator
diff --git a/Source/JavaScriptCore/wtf/CMakeLists.txt b/Source/JavaScriptCore/wtf/CMakeLists.txt
index 55d5ffa75aff..52d3e3c4d261 100644
--- a/Source/JavaScriptCore/wtf/CMakeLists.txt
+++ b/Source/JavaScriptCore/wtf/CMakeLists.txt
@@ -186,12 +186,12 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/wtf/unicode"
     "${JAVASCRIPTCORE_DIR}/wtf/dtoa"
     "${JavaScriptCore_INCLUDE_DIRECTORIES}"
+    "${THIRDPARTY_DIR}"
 )
 
 SET(WTF_LIBRARIES
 )
 
-
 IF (ENABLE_FAST_MALLOC)
     LIST(APPEND WTF_SOURCES
         TCSystemAlloc.cpp
@@ -200,15 +200,8 @@ ELSE ()
     ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
 ENDIF()
 
-
-SET(WTF_PORT_FLAGS )
 INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/wtf/Platform${PORT}.cmake)
 
-LIST(APPEND WTF_INCLUDE_DIRECTORIES
-    "${CMAKE_BINARY_DIR}"
-    "${CMAKE_SOURCE_DIR}/Source/ThirdParty"
-)
-
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
 INCLUDE_DIRECTORIES(${WTF_INCLUDE_DIRECTORIES})
 ADD_DEFINITIONS(-DBUILDING_WTF)