[webkit-changes] [172586] trunk/Tools

Thu, 14 Aug 2014 09:08:46 -0700

Title: [172586] trunk/Tools
Revision
172586
Author
[email protected]
Date
2014-08-14 09:08:24 -0700 (Thu, 14 Aug 2014)

Log Message

Initialize a separate variable (TestWTF_SOURCES) with the list of files
that are built into the TestWTF executable and move it above the platform-specific
config file inclusion. This makes it possible to add platform-specific files to that
list (e.g. GUniquePtr.cpp for the GTK port).

Rubber-stamped by Carlos Garcia Campos.

* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (172585 => 172586)


--- trunk/Tools/ChangeLog	2014-08-14 15:58:28 UTC (rev 172585)
+++ trunk/Tools/ChangeLog	2014-08-14 16:08:24 UTC (rev 172586)
@@ -1,3 +1,15 @@
+2014-08-14  Zan Dobersek  <[email protected]>
+
+        Initialize a separate variable (TestWTF_SOURCES) with the list of files
+        that are built into the TestWTF executable and move it above the platform-specific
+        config file inclusion. This makes it possible to add platform-specific files to that
+        list (e.g. GUniquePtr.cpp for the GTK port).
+
+        Rubber-stamped by Carlos Garcia Campos.
+
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformGTK.cmake:
+
 2014-08-13  Akos Kiss  <[email protected]>
 
         [EFL] Bump up and patch dependencies to allow building for aarch64

Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (172585 => 172586)


--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2014-08-14 15:58:28 UTC (rev 172585)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2014-08-14 16:08:24 UTC (rev 172586)
@@ -63,6 +63,36 @@
     _javascript_Core
 )
 
+set(TestWTF_SOURCES
+    ${TESTWEBKITAPI_DIR}/TestsController.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/CString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/Deque.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/Functional.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashMap.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashSet.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/IntegerToStringConversion.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/ListHashSet.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/MD5.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/MathExtras.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/MediaTime.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/MetaAllocator.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/RefPtr.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/SHA1.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/SaturatedArithmeticOperations.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringBuilder.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringHasher.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringImpl.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringOperators.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringView.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/TemporaryChange.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/Vector.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/WTFString.cpp
+)
+
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 add_library(TestWebKitAPIInjectedBundle SHARED
@@ -112,33 +142,7 @@
 
 add_executable(TestWTF
     ${test_main_SOURCES}
-    ${TESTWEBKITAPI_DIR}/TestsController.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/CString.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Deque.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Functional.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashMap.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashSet.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/IntegerToStringConversion.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ListHashSet.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MD5.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MathExtras.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MediaTime.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MetaAllocator.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RefPtr.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SHA1.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SaturatedArithmeticOperations.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringBuilder.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringHasher.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringImpl.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringOperators.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringView.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/TemporaryChange.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Vector.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/WTFString.cpp
+    ${TestWTF_SOURCES}
 )
 
 target_link_libraries(TestWTF ${test_wtf_LIBRARIES})

Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (172585 => 172586)


--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2014-08-14 15:58:28 UTC (rev 172585)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2014-08-14 16:08:24 UTC (rev 172586)
@@ -134,3 +134,7 @@
 add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
 set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
 set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
+
+list(APPEND TestWTF_SOURCES
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
+)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to