Changeset 184357 in webkit

Timestamp:

May 14, 2015 3:29:25 PM (9 years ago)

Author:

Michael Catanzaro

Message:

[CMake] Don't read the LOCATION property of targets
​https://bugs.webkit.org/show_bug.cgi?id=145018

Reviewed by Martin Robinson.

Use the TARGET_FILE_DIR generator expression to determine the location of the test injected
bundle, rather than assuming that the LOCATION property of TestWebKitAPIInjectedBundle will
be the same at configure-time as it is at generate-time.

• TestWebKitAPI/CMakeLists.txt:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/CMakeLists.txt (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-05-14  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Don't read the LOCATION property of targets
+        https://bugs.webkit.org/show_bug.cgi?id=145018
+
+        Reviewed by Martin Robinson.
+
+        Use the TARGET_FILE_DIR generator expression to determine the location of the test injected
+        bundle, rather than assuming that the LOCATION property of TestWebKitAPIInjectedBundle will
+        be the same at configure-time as it is at generate-time.
+
+        * TestWebKitAPI/CMakeLists.txt:
+
 2015-05-14  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Tools/TestWebKitAPI/CMakeLists.txt

@@ -130 +130 @@
 add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
 
-get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
-
 add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0
     -DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit2\"
-    -DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
+    -DTEST_INJECTED_BUNDLE_PATH=\"$<TARGET_FILE_DIR:TestWebKitAPIInjectedBundle>\"
 )