Changeset 120024 in webkit

Timestamp:

Jun 11, 2012 5:58:24 PM (12 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[CMAKE][EFL] Remove duplicated executable output path
​https://bugs.webkit.org/show_bug.cgi?id=88765

Reviewed by Daniel Bates.

CMake files for EFL port have redefined executable output path. However, EFL port doesn't
need to define again because it is already defined in top-level CMake file.

Source/JavaScriptCore:

• shell/CMakeLists.txt:

Source/WebKit2:

• CMakeLists.txt:

Tools:

• DumpRenderTree/efl/CMakeLists.txt:
• EWebLauncher/CMakeLists.txt:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/shell/CMakeLists.txt (modified) (1 diff)
• Source/WebKit2/CMakeLists.txt (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/CMakeLists.txt (modified) (1 diff)
• Tools/EWebLauncher/CMakeLists.txt (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-06-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE][EFL] Remove duplicated executable output path
+        https://bugs.webkit.org/show_bug.cgi?id=88765
+
+        Reviewed by Daniel Bates.
+
+        CMake files for EFL port have redefined executable output path. However, EFL port doesn't
+        need to define again because it is already defined in top-level CMake file.
+
+        * shell/CMakeLists.txt:
+
 2012-06-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/shell/CMakeLists.txt

@@ -20 +20 @@
 ENDIF ()
 
-IF ("${PORT}" STREQUAL "Efl")
-    SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-ENDIF ()
-
 IF (SHOULD_INSTALL_JS_SHELL)
     INSTALL(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION bin)

trunk/Source/WebKit2/CMakeLists.txt

@@ -494 +494 @@
 )
 
-SET(WebProcess_NAME bin/WebProcess)
+SET(WebProcess_NAME WebProcess)
 
 SET(WebProcess_LIBRARIES
@@ -536 +536 @@
 TARGET_LINK_LIBRARIES(${WebProcess_NAME} ${WebProcess_LIBRARIES})
 SET_TARGET_PROPERTIES(${WebProcess_NAME} PROPERTIES FOLDER "WebKit")
-SET_TARGET_PROPERTIES(${WebProcess_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
 SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-06-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE][EFL] Remove duplicated executable output path
+        https://bugs.webkit.org/show_bug.cgi?id=88765
+
+        Reviewed by Daniel Bates.
+
+        CMake files for EFL port have redefined executable output path. However, EFL port doesn't
+        need to define again because it is already defined in top-level CMake file.
+
+        * CMakeLists.txt:
+
 2012-06-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [CMAKE][EFL] Remove duplicated executable output path
+        https://bugs.webkit.org/show_bug.cgi?id=88765
+
+        Reviewed by Daniel Bates.
+
+        CMake files for EFL port have redefined executable output path. However, EFL port doesn't
+        need to define again because it is already defined in top-level CMake file.
+
+        * DumpRenderTree/efl/CMakeLists.txt:
+        * EWebLauncher/CMakeLists.txt:
+
 2012-06-11  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/DumpRenderTree/efl/CMakeLists.txt

@@ -118 +118 @@
 INCLUDE_DIRECTORIES(${DumpRenderTree_INCLUDE_DIRECTORIES})
 
-ADD_EXECUTABLE(bin/DumpRenderTree ${DumpRenderTree_SOURCES})
-TARGET_LINK_LIBRARIES(bin/DumpRenderTree ${DumpRenderTree_LIBRARIES})
-ADD_TARGET_PROPERTIES(bin/DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(bin/DumpRenderTree PROPERTIES FOLDER "Tools")
-SET_TARGET_PROPERTIES(bin/DumpRenderTree PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(DumpRenderTree ${DumpRenderTree_SOURCES})
+TARGET_LINK_LIBRARIES(DumpRenderTree ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(DumpRenderTree PROPERTIES FOLDER "Tools")
 
-ADD_EXECUTABLE(bin/ImageDiff ${ImageDiff_SOURCES})
-TARGET_LINK_LIBRARIES(bin/ImageDiff ${DumpRenderTree_LIBRARIES})
-ADD_TARGET_PROPERTIES(bin/ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(bin/ImageDiff PROPERTIES FOLDER "Tools")
-SET_TARGET_PROPERTIES(bin/ImageDiff PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(ImageDiff ${ImageDiff_SOURCES})
+TARGET_LINK_LIBRARIES(ImageDiff ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ImageDiff PROPERTIES FOLDER "Tools")

trunk/Tools/EWebLauncher/CMakeLists.txt

@@ -40 +40 @@
 
 INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
-ADD_EXECUTABLE(bin/EWebLauncher ${EWebLauncher_SOURCES})
-TARGET_LINK_LIBRARIES(bin/EWebLauncher ${EWebLauncher_LIBRARIES})
-ADD_TARGET_PROPERTIES(bin/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
-SET_TARGET_PROPERTIES(bin/EWebLauncher PROPERTIES FOLDER "Tools")
-SET_TARGET_PROPERTIES(bin/EWebLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+ADD_EXECUTABLE(EWebLauncher ${EWebLauncher_SOURCES})
+TARGET_LINK_LIBRARIES(EWebLauncher ${EWebLauncher_LIBRARIES})
+ADD_TARGET_PROPERTIES(EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(EWebLauncher PROPERTIES FOLDER "Tools")