[CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 May 2013 11:36:50 +0000 (11:36 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 May 2013 11:36:50 +0000 (11:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114554

Reviewed by Gyuyoung Kim.

Using variables as target names is very uncommon in CMake.
The usual way to specify the name of the resulting binary
is to set the OUTPUT_NAME target property.

.:

* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/PlatformEfl.cmake:
* Source/PlatformGTK.cmake:
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitHelpers.cmake:
* Source/cmake/gtest/CMakeLists.txt:

Source/JavaScriptCore:

* CMakeLists.txt:
* shell/CMakeLists.txt:

Source/WebCore:

* CMakeLists.txt:

Source/WebKit:

* CMakeLists.txt:
* PlatformBlackBerry.cmake:
* PlatformEfl.cmake:

Source/WebKit/efl:

* ewebkit.pc.in:

Source/WebKit2:

* CMakeLists.txt:
* PlatformEfl.cmake:
* efl/ewebkit2.pc.in:

Source/WTF:

* wtf/CMakeLists.txt:

Tools:

* DumpRenderTree/efl/CMakeLists.txt:
* EWebLauncher/CMakeLists.txt:
* ImageDiff/CMakeLists.txt:
* MiniBrowser/efl/CMakeLists.txt:
* TestWebKitAPI/CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/PlatformEfl.cmake:
* WinCELauncher/CMakeLists.txt:

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

36 files changed:
CMakeLists.txt
ChangeLog
Source/CMakeLists.txt
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/CMakeLists.txt
Source/PlatformEfl.cmake
Source/PlatformGTK.cmake
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformBlackBerry.cmake
Source/WebKit/PlatformEfl.cmake
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewebkit.pc.in
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/efl/ewebkit2.pc.in
Source/cmake/OptionsBlackBerry.cmake
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitHelpers.cmake
Source/cmake/gtest/CMakeLists.txt
Tools/ChangeLog
Tools/DumpRenderTree/efl/CMakeLists.txt
Tools/EWebLauncher/CMakeLists.txt
Tools/ImageDiff/CMakeLists.txt
Tools/MiniBrowser/efl/CMakeLists.txt
Tools/TestWebKitAPI/CMakeLists.txt
Tools/WebKitTestRunner/CMakeLists.txt
Tools/WebKitTestRunner/PlatformEfl.cmake
Tools/WinCELauncher/CMakeLists.txt

index 60c9a62..281f94a 100644 (file)
@@ -99,17 +99,6 @@ else ()
 endif ()
 
 # -----------------------------------------------------------------------------
-# Default target names (can be overrriden in Options${PORT}.cmake file)
-# -----------------------------------------------------------------------------
-set(JSC_EXECUTABLE_NAME JSC)
-set(WTF_LIBRARY_NAME WTF)
-set(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
-set(WebCore_LIBRARY_NAME WebCore)
-set(WebKit_LIBRARY_NAME WebKit)
-set(WebKit2_LIBRARY_NAME WebKit2)
-set(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
-
-# -----------------------------------------------------------------------------
 # Default library types
 # -----------------------------------------------------------------------------
 option(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
index 8acf4f6..f59329f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * CMakeLists.txt:
+        * Source/CMakeLists.txt:
+        * Source/PlatformEfl.cmake:
+        * Source/PlatformGTK.cmake:
+        * Source/cmake/OptionsBlackBerry.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/WebKitHelpers.cmake:
+        * Source/cmake/gtest/CMakeLists.txt:
+
 2013-05-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         Unreviewed EFL build fix.
index 6c21606..3736eea 100644 (file)
@@ -30,20 +30,20 @@ if (${PORT} STREQUAL "Efl")
     set(ADDITIONAL_FLAGS ENABLE_WERROR)
 endif ()
 
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_FLAGS})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_FLAGS})
 
 if (ENABLE_WEBCORE)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCoreTestSupport_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_FLAGS})
 endif ()
 
 if (ENABLE_WEBKIT)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_FLAGS})
 endif ()
 
 if (ENABLE_WEBKIT2)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit2_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_FLAGS})
 endif ()
 
 # -----------------------------------------------------------------------------
index e8074d3..0d7299e 100644 (file)
@@ -340,7 +340,7 @@ set(JavaScriptCore_LUT_FILES
 )
 
 set(JavaScriptCore_LIBRARIES
-    ${WTF_LIBRARY_NAME}
+    WTF
 )
 
 if (WTF_USE_ICU_UNICODE)
@@ -404,7 +404,7 @@ if (ENABLE_LLINT)
         ${JAVASCRIPTCORE_DIR}/llint/LLIntOffsetsExtractor.cpp
         ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
     )
-    target_link_libraries(LLIntOffsetsExtractor ${WTF_LIBRARY_NAME})
+    target_link_libraries(LLIntOffsetsExtractor WTF)
 
     # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
     # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
@@ -537,12 +537,16 @@ add_subdirectory(shell)
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
 add_definitions(-DBUILDING_JavaScriptCore)
-add_library(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
-target_link_libraries(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARIES})
-set_target_properties(${JavaScriptCore_LIBRARY_NAME} PROPERTIES FOLDER "JavaScriptCore")
-set_target_properties(${JavaScriptCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
+target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
+set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
+set_target_properties(JavaScriptCore PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+if (JavaScriptCore_OUTPUT_NAME)
+    set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
+endif ()
 
 if (SHARED_CORE)
-    set_target_properties(${JavaScriptCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    install(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
+    set_target_properties(JavaScriptCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+    install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
 endif ()
index 62e1df7..3b57855 100644 (file)
@@ -1,3 +1,17 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * CMakeLists.txt:
+        * shell/CMakeLists.txt:
+
 2013-05-17  Patrick Gansterer  <paroga@webkit.org>
 
         [CMake] Remove invalid include paths
index a24c314..fcbe429 100644 (file)
@@ -3,8 +3,8 @@ set(JSC_SOURCES
 )
 
 set(JSC_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
+    WTF
+    JavaScriptCore
     ${CMAKE_DL_LIBS}
 )
 
@@ -16,14 +16,18 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
-add_executable(${JSC_EXECUTABLE_NAME} ${JSC_SOURCES})
-target_link_libraries(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES})
-set_target_properties(${JSC_EXECUTABLE_NAME} PROPERTIES FOLDER "JavaScriptCore")
+add_executable(jsc ${JSC_SOURCES})
+target_link_libraries(jsc ${JSC_LIBRARIES})
+set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
+
+if (JSC_OUTPUT_NAME)
+    set_target_properties(jsc PROPERTIES OUTPUT_NAME ${JSC_OUTPUT_NAME})
+endif ()
 
 if (JSC_LINK_FLAGS)
-    ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS "${JSC_LINK_FLAGS}")
+    ADD_TARGET_PROPERTIES(jsc LINK_FLAGS "${JSC_LINK_FLAGS}")
 endif ()
 
 if (SHOULD_INSTALL_JS_SHELL)
-    install(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
+    install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}")
 endif ()
index bab370b..3750282 100644 (file)
@@ -7,7 +7,7 @@ if (ENABLE_INSPECTOR)
         COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
         COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
         COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}
-        DEPENDS ${WebCore_LIBRARY_NAME}
+        DEPENDS WebCore
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
     install(DIRECTORY "${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}"
index e12e2eb..8af7100 100644 (file)
@@ -5,7 +5,7 @@ if (ENABLE_INSPECTOR)
         COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${DATA_BUILD_DIR}/webinspector
         COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${DATA_BUILD_DIR}/webinspector
         COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${DATA_BUILD_DIR}/webinspector
-        DEPENDS ${WebCore_LIBRARY_NAME}
+        DEPENDS WebCore
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
     install(DIRECTORY "${DATA_BUILD_DIR}/webinspector"
index bca8cc8..617edb0 100644 (file)
@@ -1,3 +1,16 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * wtf/CMakeLists.txt:
+
 2013-05-17  Andreas Kling  <akling@apple.com>
 
         Re-align the OS(AIX) macro...
index 729d06a..5bcd336 100644 (file)
@@ -266,6 +266,10 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
 include_directories(${WTF_INCLUDE_DIRECTORIES})
 add_definitions(-DBUILDING_WTF)
-add_library(${WTF_LIBRARY_NAME} STATIC ${WTF_HEADERS} ${WTF_SOURCES})
-target_link_libraries(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES})
-set_target_properties(${WTF_LIBRARY_NAME} PROPERTIES FOLDER "JavaScriptCore")
+add_library(WTF STATIC ${WTF_HEADERS} ${WTF_SOURCES})
+target_link_libraries(WTF ${WTF_LIBRARIES})
+set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
+
+if (WTF_OUTPUT_NAME)
+    set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
+endif ()
index c195a92..b41e358 100644 (file)
@@ -2578,8 +2578,8 @@ set(WebCore_PLUG_INS_RESOURCES
 )
 
 set(WebCore_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
+    WTF
+    JavaScriptCore
 )
 
 if (ENABLE_SQL_DATABASE AND ENABLE_WORKERS)
@@ -3178,36 +3178,46 @@ WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOUR
 add_definitions(-DBUILDING_WebCore)
 include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
 
-add_library(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
-set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
-set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
+set_target_properties(WebCore PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
-add_library(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
-set_target_properties(${WebCoreTestSupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
+if (WebCore_OUTPUT_NAME)
+    set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
+endif ()
+
+add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
+set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
+
+if (WebCoreTestSupport_OUTPUT_NAME)
+    set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
+endif ()
 
-add_dependencies(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})
-add_dependencies(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
+add_dependencies(WebCore JavaScriptCore)
+add_dependencies(WebCoreTestSupport WebCore)
 
 if (WTF_USE_LEVELDB)
-    set(LEVELDB_LIBRARY_NAME leveldb)
-    add_library(${LEVELDB_LIBRARY_NAME} STATIC ${LEVELDB_SOURCES})
-    target_link_libraries(${LEVELDB_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT})
-    set_target_properties(${LEVELDB_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1")
-    list(APPEND WebCore_LIBRARIES ${LEVELDB_LIBRARY_NAME})
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${LEVELDB_LIBRARY_NAME} IGNORECXX_WARNINGS)
+    add_library(leveldb STATIC ${LEVELDB_SOURCES})
+    target_link_libraries(leveldb ${CMAKE_THREAD_LIBS_INIT})
+    set_target_properties(leveldb PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1")
+    list(APPEND WebCore_LIBRARIES leveldb)
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(leveldb IGNORECXX_WARNINGS)
 endif ()
 
 if (WTF_USE_3D_GRAPHICS)
-    set(ANGLESupport_LIBRARY_NAME ANGLESupport)
-    add_library(${ANGLESupport_LIBRARY_NAME} STATIC ${ANGLESupport_SOURCES})
-    set_target_properties(${ANGLESupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
-    list(APPEND WebCore_LIBRARIES ${ANGLESupport_LIBRARY_NAME})
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${ANGLESupport_LIBRARY_NAME} IGNORECXX_WARNINGS)
+    add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
+    set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
+    list(APPEND WebCore_LIBRARIES ANGLESupport)
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS)
 endif ()
 
-target_link_libraries(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
+target_link_libraries(WebCore ${WebCore_LIBRARIES})
+
+if (WebCore_OUTPUT_NAME)
+    set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
+endif ()
 
 if (SHARED_CORE)
-    set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    install(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
+    set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+    install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")
 endif ()
index 904733b..c319ebe 100644 (file)
@@ -1,3 +1,16 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * CMakeLists.txt:
+
 2013-05-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Move GTK port off legacy clipboard
index a92d3a6..03bfdd9 100644 (file)
@@ -76,26 +76,30 @@ if (WTF_USE_CURL)
 endif ()
 
 set(WebKit_LIBRARIES
-    ${WebCore_LIBRARY_NAME}
+    WebCore
 )
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 add_definitions(-DBUILDING_WebKit)
 include_directories(${WebKit_INCLUDE_DIRECTORIES})
-add_library(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
-add_dependencies(${WebKit_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
-target_link_libraries(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
-set_target_properties(${WebKit_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
-set_target_properties(${WebKit_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
+add_dependencies(WebKit WebCore)
+target_link_libraries(WebKit ${WebKit_LIBRARIES})
+set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
+set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 if (WebKit_LINK_FLAGS)
-    ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
+    ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${WebKit_LINK_FLAGS}")
 endif ()
 
 if (VERSION_SCRIPT)
-    ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${VERSION_SCRIPT}")
+    ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${VERSION_SCRIPT}")
 endif ()
 
-set_target_properties(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-install(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
+if (WebKit_OUTPUT_NAME)
+    set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
+endif ()
+
+set_target_properties(WebKit PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
index 5b2865e..dfdf05c 100644 (file)
@@ -1,3 +1,18 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * CMakeLists.txt:
+        * PlatformBlackBerry.cmake:
+        * PlatformEfl.cmake:
+
 2013-05-15  Ryosuke Niwa  <rniwa@webkit.org>
 
         Revert the previous commit.
index b295205..7e3c017 100644 (file)
@@ -181,7 +181,7 @@ list(APPEND WebKit_LIBRARIES
     ${INTL_LIBRARY}
     ${ITYPE_LIBRARY}
     ${JPEG_LIBRARY}
-    ${JavaScriptCore_LIBRARY_NAME}
+    JavaScriptCore
     ${LEVELDB_LIBRARY}
     ${MMR_LIBRARY}
     ${M_LIBRARY}
@@ -265,7 +265,7 @@ endif ()
 add_custom_target(
     inspector ALL
     command cp ${WEBCORE_DIR}/inspector/front-end/inspector.html ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html && echo '<script src="inspectorBB.js"></script>'  >> ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html
-    DEPENDS ${WebCore_LIBRARY_NAME}
+    DEPENDS WebCore
     COMMENT "Web Inspector resources building..."
 )
 
index df705a8..019b5dc 100644 (file)
@@ -173,7 +173,7 @@ list(APPEND WebKit_LIBRARIES
 )
 
 if (SHARED_CORE)
-    set(LIBS_PRIVATE "-l${WTF_LIBRARY_NAME} -l${JavaScriptCore_LIBRARY_NAME} -l${WebCore_LIBRARY_NAME}")
+    set(LIBS_PRIVATE "-l${WTF_OUTPUT_NAME} -l${JavaScriptCore_OUTPUT_NAME} -l${WebCore_OUTPUT_NAME}")
 else ()
     set(LIBS_PRIVATE "")
 endif ()
@@ -207,15 +207,15 @@ set(EWebKit_HEADERS
 )
 
 install(FILES ${EWebKit_HEADERS}
-        DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
+        DESTINATION include/${WebKit_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR})
 
 include_directories(${THIRDPARTY_DIR}/gtest/include)
 
 set(EWKUnitTests_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit_LIBRARY_NAME}
+    WTF
+    JavaScriptCore
+    WebCore
+    WebKit
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
     ${EVAS_LIBRARIES}
index 4c6f8af..268e566 100644 (file)
@@ -1,3 +1,16 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * ewebkit.pc.in:
+
 2013-05-16  Seokju Kwon  <seokju.kwon@gmail.com>
 
         [EFL] inspector-protocol/page/javascriptDialogEvents.html is failing
index 2ffd291..4411207 100644 (file)
@@ -10,4 +10,4 @@ Version: @PROJECT_VERSION@
 Requires: cairo evas ecore libsoup-2.4 ecore-input
 Libs: -L${libdir} -lewebkit @EXTRA_EWEBKIT_LINK@
 Libs.private: @LIBS_PRIVATE@
-Cflags: -I${includedir}/@WebKit_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
+Cflags: -I${includedir}/@WebKit_OUTPUT_NAME@-@PROJECT_VERSION_MAJOR@
index cc26165..9ad1505 100644 (file)
@@ -587,17 +587,15 @@ set(WebKit2_MESSAGES_IN_FILES
     WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in
 )
 
-set(WebProcess_EXECUTABLE_NAME WebProcess)
-
 set(WebProcess_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit2_LIBRARY_NAME}
+    JavaScriptCore
+    WebCore
+    WebKit2
 )
 
 set(WebKit2_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
+    WTF
+    WebCore
 )
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -622,20 +620,24 @@ endforeach ()
 
 add_definitions(-DBUILDING_WEBKIT)
 include_directories(${WebKit2_INCLUDE_DIRECTORIES})
-add_library(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
+add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
+
+add_dependencies(WebKit2 WebCore)
+add_dependencies(WebKit2 ${ForwardingHeaders_NAME})
+add_dependencies(WebKit2 ${ForwardingNetworkHeaders_NAME})
+target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
+set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
+set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
-add_dependencies(${WebKit2_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
-add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME})
-add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME})
-target_link_libraries(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES})
-set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
-set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+if (WebKit2_OUTPUT_NAME)
+    set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})
+endif ()
 
-add_executable(${WebProcess_EXECUTABLE_NAME} ${WebProcess_SOURCES})
-target_link_libraries(${WebProcess_EXECUTABLE_NAME} ${WebProcess_LIBRARIES})
-set_target_properties(${WebProcess_EXECUTABLE_NAME} PROPERTIES FOLDER "WebKit")
+add_executable(WebProcess ${WebProcess_SOURCES})
+target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
+set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
 
-set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+set_target_properties(WebKit2 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 
-install(TARGETS ${WebKit2_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
-install(TARGETS ${WebProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
+install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}")
+install(TARGETS WebProcess DESTINATION "${EXEC_INSTALL_DIR}")
index 0722705..a5c86ad 100644 (file)
@@ -1,3 +1,18 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * efl/ewebkit2.pc.in:
+
 2013-05-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Move GTK port off legacy clipboard
index 43581c9..575106b 100644 (file)
@@ -340,12 +340,11 @@ set(EWebKit2_HEADERS
 )
 
 install(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig)
-install(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
+install(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR})
 
 if (ENABLE_PLUGIN_PROCESS)
     add_definitions(-DENABLE_PLUGIN_PROCESS=1)
 
-    set(PluginProcess_EXECUTABLE_NAME PluginProcess)
     list(APPEND PluginProcess_INCLUDE_DIRECTORIES
         "${WEBKIT2_DIR}/PluginProcess/unix"
     )
@@ -357,21 +356,21 @@ if (ENABLE_PLUGIN_PROCESS)
     )
 
     set(PluginProcess_LIBRARIES
-        ${WebKit2_LIBRARY_NAME}
+        WebKit2
     )
 
-    add_executable(${PluginProcess_EXECUTABLE_NAME} ${PluginProcess_SOURCES})
-    target_link_libraries(${PluginProcess_EXECUTABLE_NAME} ${PluginProcess_LIBRARIES})
-    install(TARGETS ${PluginProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
+    add_executable(PluginProcess ${PluginProcess_SOURCES})
+    target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
+    install(TARGETS PluginProcess DESTINATION "${EXEC_INSTALL_DIR}")
 endif () # ENABLE_PLUGIN_PROCESS
 
 include_directories(${THIRDPARTY_DIR}/gtest/include)
 
 set(EWK2UnitTests_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit2_LIBRARY_NAME}
+    WTF
+    JavaScriptCore
+    WebCore
+    WebKit2
     ${CAIRO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
@@ -392,8 +391,8 @@ add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
     -DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
     -DGTEST_LINKED_AS_SHARED_LIBRARY=1
     -DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\"
-    -DWEBPROCESSNAME=\"${WebProcess_EXECUTABLE_NAME}\"
-    -DPLUGINPROCESSNAME=\"${PluginProcess_EXECUTABLE_NAME}\"
+    -DWEBPROCESSNAME=\"WebProcess\"
+    -DPLUGINPROCESSNAME=\"PluginProcess\"
 )
 
 add_library(ewk2UnitTestUtils
@@ -445,7 +444,7 @@ if (ENABLE_API_TESTS)
     endforeach ()
 
     add_library(ewk2UnitTestInjectedBundleSample SHARED ${TEST_INJECTED_BUNDLE_DIR}/injected_bundle_sample.cpp)
-    target_link_libraries(ewk2UnitTestInjectedBundleSample ${WebKit2_LIBRARY_NAME})
+    target_link_libraries(ewk2UnitTestInjectedBundleSample WebKit2)
 endif ()
 
 if (ENABLE_SPELLCHECK)
index b0182ca..9e28beb 100644 (file)
@@ -10,4 +10,4 @@ Version: @PROJECT_VERSION@
 Requires: cairo evas ecore libsoup-2.4 ecore-input
 Libs: -L${libdir} -lewebkit2
 Libs.private: @LIBS_PRIVATE@
-Cflags: -I${includedir}/@WebKit2_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
+Cflags: -I${includedir}/@WebKit2_OUTPUT_NAME@-@PROJECT_VERSION_MAJOR@
index ba1515c..9111311 100644 (file)
@@ -142,13 +142,11 @@ endif ()
 
 include_directories(${CMAKE_INCLUDE_PATH})
 
-set(JSC_EXECUTABLE_NAME jsc)
-
-set(WTF_LIBRARY_NAME wtf)
-set(JavaScriptCore_LIBRARY_NAME javascriptcore)
-set(WebCore_LIBRARY_NAME webcore)
-set(WebKit_LIBRARY_NAME webkit)
-set(WebKit_DRT_LIBRARY_NAME webkit_DRT)
+set(WTF_OUTPUT_NAME wtf)
+set(JavaScriptCore_OUTPUT_NAME javascriptcore)
+set(WebCore_OUTPUT_NAME webcore)
+set(WebKit_OUTPUT_NAME webkit)
+set(WebKit_DRT_OUTPUT_NAME webkit_DRT)
 
 WEBKIT_OPTION_BEGIN()
 
index 42b7379..580bc53 100644 (file)
@@ -36,15 +36,13 @@ add_definitions(-DWTF_USE_ICU_UNICODE=1)
 add_definitions(-DWTF_USE_CAIRO=1)
 add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
 
-set(JSC_EXECUTABLE_NAME jsc)
+set(WTF_OUTPUT_NAME wtf_efl)
+set(JavaScriptCore_OUTPUT_NAME javascriptcore_efl)
+set(WebCore_OUTPUT_NAME webcore_efl)
+set(WebKit_OUTPUT_NAME ewebkit)
+set(WebKit2_OUTPUT_NAME ewebkit2)
 
-set(WTF_LIBRARY_NAME wtf_efl)
-set(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)
-set(WebCore_LIBRARY_NAME webcore_efl)
-set(WebKit_LIBRARY_NAME ewebkit)
-set(WebKit2_LIBRARY_NAME ewebkit2)
-
-set(DATA_INSTALL_DIR "share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
+set(DATA_INSTALL_DIR "share/${WebKit_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
 set(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebCore/platform/efl/DefaultTheme)
 file(MAKE_DIRECTORY ${THEME_BINARY_DIR})
 
index df36a7c..a803f0d 100644 (file)
@@ -77,17 +77,15 @@ set(ENABLE_WEBKIT2 OFF)
 
 set(WTF_USE_ICU_UNICODE 1)
 set(WTF_USE_SOUP 1)
-set(WTF_USE_ICU_UNICODE 1)
 
-set(JSC_EXECUTABLE_NAME jsc)
-set(WTF_LIBRARY_NAME WTFGTK)
-set(JavaScriptCore_LIBRARY_NAME javascriptcoregtk)
-set(WebCore_LIBRARY_NAME WebCoreGTK)
-set(WebKit_LIBRARY_NAME webkitgtk-3.0)
-set(WebKit2_LIBRARY_NAME webkit2gtk-3.0)
+set(WTF_OUTPUT_NAME WTFGTK)
+set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk)
+set(WebCore_OUTPUT_NAME WebCoreGTK)
+set(WebKit_OUTPUT_NAME webkitgtk-3.0)
+set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
 
-set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_LIBRARY_NAME}")
+set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
 set(DATA_INSTALL_DIR "${DATADIR}/webkitgtk-3.0")
 
 add_definitions(-DBUILDING_GTK__=1)
index 488e114..975d708 100644 (file)
@@ -51,7 +51,7 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
             set(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -Wno-c++0x-compat")
         endif ()
 
-        if ("${_target}" MATCHES "${WebKit2_LIBRARY_NAME}")
+        if ("${_target}" MATCHES "WebKit2")
             set(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -std=c++0x")
         endif ()
 
index 2139764..56bf447 100644 (file)
@@ -24,7 +24,7 @@ add_library(gtest SHARED
 add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
 
 target_link_libraries(gtest
-    ${WTF_LIBRARY_NAME}
+    WTF
 )
 
 if (CMAKE_USE_PTHREADS_INIT)
index 1979a24..5a95973 100644 (file)
@@ -1,3 +1,23 @@
+2013-05-18  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=114554
+
+        Reviewed by Gyuyoung Kim.
+
+        Using variables as target names is very uncommon in CMake.
+        The usual way to specify the name of the resulting binary
+        is to set the OUTPUT_NAME target property.
+
+        * DumpRenderTree/efl/CMakeLists.txt:
+        * EWebLauncher/CMakeLists.txt:
+        * ImageDiff/CMakeLists.txt:
+        * MiniBrowser/efl/CMakeLists.txt:
+        * TestWebKitAPI/CMakeLists.txt:
+        * WebKitTestRunner/CMakeLists.txt:
+        * WebKitTestRunner/PlatformEfl.cmake:
+        * WinCELauncher/CMakeLists.txt:
+
 2013-05-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         Unreviewed EFL build fix.
index 994fcce..3febd34 100644 (file)
@@ -30,11 +30,11 @@ set(DumpRenderTree_SOURCES
 )
 
 set(DumpRenderTree_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCoreTestSupport_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit_LIBRARY_NAME}
-    ${WTF_LIBRARY_NAME}
+    JavaScriptCore
+    WebCoreTestSupport
+    WebCore
+    WebKit
+    WTF
     ${CAIRO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
index 041a99b..3e9d7f4 100644 (file)
@@ -5,9 +5,9 @@ set(EWebLauncher_SOURCES
 )
 
 set(EWebLauncher_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit_LIBRARY_NAME}
+    JavaScriptCore
+    WebCore
+    WebKit
     ${CAIRO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
index f23c3c7..6670fd5 100644 (file)
@@ -6,7 +6,7 @@ set(IMAGE_DIFF_INCLUDE_DIRECTORIES
 )
 
 set(IMAGE_DIFF_LIBRARIES
-    ${WTF_LIBRARY_NAME}
+    WTF
 )
 
 INCLUDE_IF_EXISTS(${IMAGE_DIFF_DIR}/Platform${PORT}.cmake)
index 890bad2..ad0cc41 100644 (file)
@@ -32,9 +32,9 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
 )
 
 set(MiniBrowser_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebKit2_LIBRARY_NAME}
+    JavaScriptCore
+    WebCore
+    WebKit2
     ${CAIRO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
index 70a9bc1..4d6c7c3 100644 (file)
@@ -51,8 +51,8 @@ add_library(TestWebKitAPIInjectedBundle SHARED
     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
 )
 
-target_link_libraries(TestWebKitAPIInjectedBundle ${WTF_LIBRARY_NAME})
-add_dependencies(TestWebKitAPIInjectedBundle ${WebKit2_LIBRARY_NAME} ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+target_link_libraries(TestWebKitAPIInjectedBundle WTF)
+add_dependencies(TestWebKitAPIInjectedBundle WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
 get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
 
@@ -62,7 +62,7 @@ add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1
 )
 
 set(test_wtf_LIBRARIES
-    ${WTF_LIBRARY_NAME}
+    WTF
     gtest
 )
 
@@ -98,8 +98,8 @@ set_tests_properties(test_wtf PROPERTIES TIMEOUT 60)
 
 set(test_webcore_LIBRARIES
     gtest
-    ${WTF_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
+    WTF
+    WebCore
 )
 
 foreach (testName ${test_webcore_BINARIES})
@@ -117,13 +117,13 @@ add_library(TestWebKitAPIBase
     ${TESTWEBKITAPI_DIR}/TestsController.cpp
 )
 
-add_dependencies(TestWebKitAPIBase ${WebKit2_LIBRARY_NAME} ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
 set(test_webkit2_api_LIBRARIES
     TestWebKitAPIBase
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebKit2_LIBRARY_NAME}
+    WTF
+    JavaScriptCore
+    WebKit2
     gtest
 )
 
index ff4d5e5..7ab88db 100644 (file)
@@ -14,10 +14,10 @@ set(WebKitTestRunner_SOURCES
 )
 
 set(WebKitTestRunner_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
-    ${WebCore_LIBRARY_NAME}
-    ${WebCoreTestSupport_LIBRARY_NAME}
-    ${WebKit2_LIBRARY_NAME}
+    JavaScriptCore
+    WebCore
+    WebCoreTestSupport
+    WebKit2
 )
 
 set(WebKitTestRunner_INCLUDE_DIRECTORIES
@@ -95,5 +95,5 @@ target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
 add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
 target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES})
 
-add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingHeadersForWebKitTestRunner_NAME})
-add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeadersForWebKitTestRunner_NAME})
+add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
+add_dependencies(WebKit2 ${ForwardingNetworkHeadersForWebKitTestRunner_NAME})
index 9044818..50aefca 100644 (file)
@@ -40,7 +40,7 @@ list(APPEND WebKitTestRunner_LIBRARIES
     ${EVAS_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
-    ${WTF_LIBRARY_NAME}
+    WTF
 )
 
 if (ENABLE_ECORE_X)
index 06f70ca..914bb2b 100644 (file)
@@ -16,12 +16,12 @@ set(WinCELauncher_SOURCES
 )
 
 set(WinCELauncher_LIBRARIES
-    ${WebKit_LIBRARY_NAME}
+    WebKit
 )
 
 include_directories(${WinCELauncher_INCLUDE_DIRECTORIES})
 add_executable(WinCELauncher WIN32 ${WinCELauncher_SOURCES})
-add_dependencies(WinCELauncher ${WebKit_LIBRARY_NAME})
+add_dependencies(WinCELauncher WebKit)
 target_link_libraries(WinCELauncher ${WinCELauncher_LIBRARIES})
 set_target_properties(WinCELauncher PROPERTIES FOLDER "Tools")
 set_target_properties(WinCELauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")