Changeset 150336 in webkit
- Timestamp:
- May 18, 2013 4:36:50 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 36 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r149968 r150336 100 100 101 101 # ----------------------------------------------------------------------------- 102 # Default target names (can be overrriden in Options${PORT}.cmake file)103 # -----------------------------------------------------------------------------104 set(JSC_EXECUTABLE_NAME JSC)105 set(WTF_LIBRARY_NAME WTF)106 set(JavaScriptCore_LIBRARY_NAME JavaScriptCore)107 set(WebCore_LIBRARY_NAME WebCore)108 set(WebKit_LIBRARY_NAME WebKit)109 set(WebKit2_LIBRARY_NAME WebKit2)110 set(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)111 112 # -----------------------------------------------------------------------------113 102 # Default library types 114 103 # ----------------------------------------------------------------------------- -
trunk/ChangeLog
r150335 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * CMakeLists.txt: 13 * Source/CMakeLists.txt: 14 * Source/PlatformEfl.cmake: 15 * Source/PlatformGTK.cmake: 16 * Source/cmake/OptionsBlackBerry.cmake: 17 * Source/cmake/OptionsEfl.cmake: 18 * Source/cmake/OptionsGTK.cmake: 19 * Source/cmake/WebKitHelpers.cmake: 20 * Source/cmake/gtest/CMakeLists.txt: 21 1 22 2013-05-18 Christophe Dumez <ch.dumez@sisa.samsung.com> 2 23 -
trunk/Source/CMakeLists.txt
r149968 r150336 31 31 endif () 32 32 33 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${WTF_LIBRARY_NAME}${ADDITIONAL_FLAGS})34 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${JavaScriptCore_LIBRARY_NAME}${ADDITIONAL_FLAGS})33 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_FLAGS}) 34 WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_FLAGS}) 35 35 36 36 if (ENABLE_WEBCORE) 37 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${WebCoreTestSupport_LIBRARY_NAME}${ADDITIONAL_FLAGS})38 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${WebCore_LIBRARY_NAME}${ADDITIONAL_FLAGS})37 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_FLAGS}) 38 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_FLAGS}) 39 39 endif () 40 40 41 41 if (ENABLE_WEBKIT) 42 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${WebKit_LIBRARY_NAME}${ADDITIONAL_FLAGS})42 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_FLAGS}) 43 43 endif () 44 44 45 45 if (ENABLE_WEBKIT2) 46 WEBKIT_SET_EXTRA_COMPILER_FLAGS( ${WebKit2_LIBRARY_NAME}${ADDITIONAL_FLAGS})46 WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_FLAGS}) 47 47 endif () 48 48 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r150220 r150336 341 341 342 342 set(JavaScriptCore_LIBRARIES 343 ${WTF_LIBRARY_NAME}343 WTF 344 344 ) 345 345 … … 405 405 ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h 406 406 ) 407 target_link_libraries(LLIntOffsetsExtractor ${WTF_LIBRARY_NAME})407 target_link_libraries(LLIntOffsetsExtractor WTF) 408 408 409 409 # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than … … 538 538 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES}) 539 539 add_definitions(-DBUILDING_JavaScriptCore) 540 add_library(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES}) 541 target_link_libraries(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARIES}) 542 set_target_properties(${JavaScriptCore_LIBRARY_NAME} PROPERTIES FOLDER "JavaScriptCore") 543 set_target_properties(${JavaScriptCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "") 540 add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES}) 541 target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES}) 542 set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore") 543 set_target_properties(JavaScriptCore PROPERTIES LINK_INTERFACE_LIBRARIES "") 544 545 if (JavaScriptCore_OUTPUT_NAME) 546 set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME}) 547 endif () 544 548 545 549 if (SHARED_CORE) 546 set_target_properties( ${JavaScriptCore_LIBRARY_NAME}PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})547 install(TARGETS ${JavaScriptCore_LIBRARY_NAME}DESTINATION "${LIB_INSTALL_DIR}")550 set_target_properties(JavaScriptCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 551 install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}") 548 552 endif () -
trunk/Source/JavaScriptCore/ChangeLog
r150253 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * CMakeLists.txt: 13 * shell/CMakeLists.txt: 14 1 15 2013-05-17 Patrick Gansterer <paroga@webkit.org> 2 16 -
trunk/Source/JavaScriptCore/shell/CMakeLists.txt
r150220 r150336 4 4 5 5 set(JSC_LIBRARIES 6 ${WTF_LIBRARY_NAME}7 ${JavaScriptCore_LIBRARY_NAME}6 WTF 7 JavaScriptCore 8 8 ${CMAKE_DL_LIBS} 9 9 ) … … 17 17 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) 18 18 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) 19 add_executable(${JSC_EXECUTABLE_NAME} ${JSC_SOURCES}) 20 target_link_libraries(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES}) 21 set_target_properties(${JSC_EXECUTABLE_NAME} PROPERTIES FOLDER "JavaScriptCore") 19 add_executable(jsc ${JSC_SOURCES}) 20 target_link_libraries(jsc ${JSC_LIBRARIES}) 21 set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") 22 23 if (JSC_OUTPUT_NAME) 24 set_target_properties(jsc PROPERTIES OUTPUT_NAME ${JSC_OUTPUT_NAME}) 25 endif () 22 26 23 27 if (JSC_LINK_FLAGS) 24 ADD_TARGET_PROPERTIES( ${JSC_EXECUTABLE_NAME}LINK_FLAGS "${JSC_LINK_FLAGS}")28 ADD_TARGET_PROPERTIES(jsc LINK_FLAGS "${JSC_LINK_FLAGS}") 25 29 endif () 26 30 27 31 if (SHOULD_INSTALL_JS_SHELL) 28 install(TARGETS ${JSC_EXECUTABLE_NAME}DESTINATION "${EXEC_INSTALL_DIR}")32 install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}") 29 33 endif () -
trunk/Source/PlatformEfl.cmake
r139992 r150336 8 8 COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR} 9 9 COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR} 10 DEPENDS ${WebCore_LIBRARY_NAME}10 DEPENDS WebCore 11 11 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 12 12 ) -
trunk/Source/PlatformGTK.cmake
r150189 r150336 6 6 COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${DATA_BUILD_DIR}/webinspector 7 7 COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${DATA_BUILD_DIR}/webinspector 8 DEPENDS ${WebCore_LIBRARY_NAME}8 DEPENDS WebCore 9 9 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 10 10 ) -
trunk/Source/WTF/ChangeLog
r150308 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * wtf/CMakeLists.txt: 13 1 14 2013-05-17 Andreas Kling <akling@apple.com> 2 15 -
trunk/Source/WTF/wtf/CMakeLists.txt
r150219 r150336 267 267 include_directories(${WTF_INCLUDE_DIRECTORIES}) 268 268 add_definitions(-DBUILDING_WTF) 269 add_library(${WTF_LIBRARY_NAME} STATIC ${WTF_HEADERS} ${WTF_SOURCES}) 270 target_link_libraries(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES}) 271 set_target_properties(${WTF_LIBRARY_NAME} PROPERTIES FOLDER "JavaScriptCore") 269 add_library(WTF STATIC ${WTF_HEADERS} ${WTF_SOURCES}) 270 target_link_libraries(WTF ${WTF_LIBRARIES}) 271 set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore") 272 273 if (WTF_OUTPUT_NAME) 274 set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME}) 275 endif () -
trunk/Source/WebCore/CMakeLists.txt
r150161 r150336 2579 2579 2580 2580 set(WebCore_LIBRARIES 2581 ${WTF_LIBRARY_NAME}2582 ${JavaScriptCore_LIBRARY_NAME}2581 WTF 2582 JavaScriptCore 2583 2583 ) 2584 2584 … … 3179 3179 include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES}) 3180 3180 3181 add_library(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES}) 3182 set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES FOLDER "WebCore") 3183 set_target_properties(${WebCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "") 3184 3185 add_library(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES}) 3186 set_target_properties(${WebCoreTestSupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore") 3187 3188 add_dependencies(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME}) 3189 add_dependencies(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME}) 3181 add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES}) 3182 set_target_properties(WebCore PROPERTIES FOLDER "WebCore") 3183 set_target_properties(WebCore PROPERTIES LINK_INTERFACE_LIBRARIES "") 3184 3185 if (WebCore_OUTPUT_NAME) 3186 set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME}) 3187 endif () 3188 3189 add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES}) 3190 set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore") 3191 3192 if (WebCoreTestSupport_OUTPUT_NAME) 3193 set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME}) 3194 endif () 3195 3196 add_dependencies(WebCore JavaScriptCore) 3197 add_dependencies(WebCoreTestSupport WebCore) 3190 3198 3191 3199 if (WTF_USE_LEVELDB) 3192 set(LEVELDB_LIBRARY_NAME leveldb) 3193 add_library(${LEVELDB_LIBRARY_NAME} STATIC ${LEVELDB_SOURCES}) 3194 target_link_libraries(${LEVELDB_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) 3195 set_target_properties(${LEVELDB_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1") 3196 list(APPEND WebCore_LIBRARIES ${LEVELDB_LIBRARY_NAME}) 3197 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${LEVELDB_LIBRARY_NAME} IGNORECXX_WARNINGS) 3200 add_library(leveldb STATIC ${LEVELDB_SOURCES}) 3201 target_link_libraries(leveldb ${CMAKE_THREAD_LIBS_INIT}) 3202 set_target_properties(leveldb PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1") 3203 list(APPEND WebCore_LIBRARIES leveldb) 3204 WEBKIT_SET_EXTRA_COMPILER_FLAGS(leveldb IGNORECXX_WARNINGS) 3198 3205 endif () 3199 3206 3200 3207 if (WTF_USE_3D_GRAPHICS) 3201 set(ANGLESupport_LIBRARY_NAME ANGLESupport) 3202 add_library(${ANGLESupport_LIBRARY_NAME} STATIC ${ANGLESupport_SOURCES}) 3203 set_target_properties(${ANGLESupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore") 3204 list(APPEND WebCore_LIBRARIES ${ANGLESupport_LIBRARY_NAME}) 3205 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${ANGLESupport_LIBRARY_NAME} IGNORECXX_WARNINGS) 3208 add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES}) 3209 set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore") 3210 list(APPEND WebCore_LIBRARIES ANGLESupport) 3211 WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS) 3206 3212 endif () 3207 3213 3208 target_link_libraries(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES}) 3214 target_link_libraries(WebCore ${WebCore_LIBRARIES}) 3215 3216 if (WebCore_OUTPUT_NAME) 3217 set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME}) 3218 endif () 3209 3219 3210 3220 if (SHARED_CORE) 3211 set_target_properties( ${WebCore_LIBRARY_NAME}PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})3212 install(TARGETS ${WebCore_LIBRARY_NAME}DESTINATION "${LIB_INSTALL_DIR}")3221 set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 3222 install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}") 3213 3223 endif () -
trunk/Source/WebCore/ChangeLog
r150334 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * CMakeLists.txt: 13 1 14 2013-05-18 Carlos Garcia Campos <cgarcia@igalia.com> 2 15 -
trunk/Source/WebKit/CMakeLists.txt
r147844 r150336 77 77 78 78 set(WebKit_LIBRARIES 79 ${WebCore_LIBRARY_NAME}79 WebCore 80 80 ) 81 81 … … 84 84 add_definitions(-DBUILDING_WebKit) 85 85 include_directories(${WebKit_INCLUDE_DIRECTORIES}) 86 add_library( ${WebKit_LIBRARY_NAME}${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})87 add_dependencies( ${WebKit_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})88 target_link_libraries( ${WebKit_LIBRARY_NAME}${WebKit_LIBRARIES})89 set_target_properties( ${WebKit_LIBRARY_NAME}PROPERTIES FOLDER "WebKit")90 set_target_properties( ${WebKit_LIBRARY_NAME}PROPERTIES LINK_INTERFACE_LIBRARIES "")86 add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES}) 87 add_dependencies(WebKit WebCore) 88 target_link_libraries(WebKit ${WebKit_LIBRARIES}) 89 set_target_properties(WebKit PROPERTIES FOLDER "WebKit") 90 set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "") 91 91 92 92 if (WebKit_LINK_FLAGS) 93 ADD_TARGET_PROPERTIES( ${WebKit_LIBRARY_NAME}LINK_FLAGS "${WebKit_LINK_FLAGS}")93 ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${WebKit_LINK_FLAGS}") 94 94 endif () 95 95 96 96 if (VERSION_SCRIPT) 97 ADD_TARGET_PROPERTIES( ${WebKit_LIBRARY_NAME}LINK_FLAGS "${VERSION_SCRIPT}")97 ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "${VERSION_SCRIPT}") 98 98 endif () 99 99 100 set_target_properties(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 101 install(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}") 100 if (WebKit_OUTPUT_NAME) 101 set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME}) 102 endif () 103 104 set_target_properties(WebKit PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 105 install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}") -
trunk/Source/WebKit/ChangeLog
r150172 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * CMakeLists.txt: 13 * PlatformBlackBerry.cmake: 14 * PlatformEfl.cmake: 15 1 16 2013-05-15 Ryosuke Niwa <rniwa@webkit.org> 2 17 -
trunk/Source/WebKit/PlatformBlackBerry.cmake
r150062 r150336 182 182 ${ITYPE_LIBRARY} 183 183 ${JPEG_LIBRARY} 184 ${JavaScriptCore_LIBRARY_NAME}184 JavaScriptCore 185 185 ${LEVELDB_LIBRARY} 186 186 ${MMR_LIBRARY} … … 266 266 inspector ALL 267 267 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 268 DEPENDS ${WebCore_LIBRARY_NAME}268 DEPENDS WebCore 269 269 COMMENT "Web Inspector resources building..." 270 270 ) -
trunk/Source/WebKit/PlatformEfl.cmake
r148740 r150336 174 174 175 175 if (SHARED_CORE) 176 set(LIBS_PRIVATE "-l${WTF_ LIBRARY_NAME} -l${JavaScriptCore_LIBRARY_NAME} -l${WebCore_LIBRARY_NAME}")176 set(LIBS_PRIVATE "-l${WTF_OUTPUT_NAME} -l${JavaScriptCore_OUTPUT_NAME} -l${WebCore_OUTPUT_NAME}") 177 177 else () 178 178 set(LIBS_PRIVATE "") … … 208 208 209 209 install(FILES ${EWebKit_HEADERS} 210 DESTINATION include/${WebKit_ LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})210 DESTINATION include/${WebKit_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}) 211 211 212 212 include_directories(${THIRDPARTY_DIR}/gtest/include) 213 213 214 214 set(EWKUnitTests_LIBRARIES 215 ${WTF_LIBRARY_NAME}216 ${JavaScriptCore_LIBRARY_NAME}217 ${WebCore_LIBRARY_NAME}218 ${WebKit_LIBRARY_NAME}215 WTF 216 JavaScriptCore 217 WebCore 218 WebKit 219 219 ${ECORE_LIBRARIES} 220 220 ${ECORE_EVAS_LIBRARIES} -
trunk/Source/WebKit/efl/ChangeLog
r150241 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * ewebkit.pc.in: 13 1 14 2013-05-16 Seokju Kwon <seokju.kwon@gmail.com> 2 15 -
trunk/Source/WebKit/efl/ewebkit.pc.in
r132063 r150336 11 11 Libs: -L${libdir} -lewebkit @EXTRA_EWEBKIT_LINK@ 12 12 Libs.private: @LIBS_PRIVATE@ 13 Cflags: -I${includedir}/@WebKit_ LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@13 Cflags: -I${includedir}/@WebKit_OUTPUT_NAME@-@PROJECT_VERSION_MAJOR@ -
trunk/Source/WebKit2/CMakeLists.txt
r150329 r150336 588 588 ) 589 589 590 set(WebProcess_EXECUTABLE_NAME WebProcess)591 592 590 set(WebProcess_LIBRARIES 593 ${JavaScriptCore_LIBRARY_NAME}594 ${WebCore_LIBRARY_NAME}595 ${WebKit2_LIBRARY_NAME}591 JavaScriptCore 592 WebCore 593 WebKit2 596 594 ) 597 595 598 596 set(WebKit2_LIBRARIES 599 ${WTF_LIBRARY_NAME}600 ${WebCore_LIBRARY_NAME}597 WTF 598 WebCore 601 599 ) 602 600 … … 623 621 add_definitions(-DBUILDING_WEBKIT) 624 622 include_directories(${WebKit2_INCLUDE_DIRECTORIES}) 625 add_library(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES}) 626 627 add_dependencies(${WebKit2_LIBRARY_NAME} ${WebCore_LIBRARY_NAME}) 628 add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME}) 629 add_dependencies(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME}) 630 target_link_libraries(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES}) 631 set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES FOLDER "WebKit") 632 set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "") 633 634 add_executable(${WebProcess_EXECUTABLE_NAME} ${WebProcess_SOURCES}) 635 target_link_libraries(${WebProcess_EXECUTABLE_NAME} ${WebProcess_LIBRARIES}) 636 set_target_properties(${WebProcess_EXECUTABLE_NAME} PROPERTIES FOLDER "WebKit") 637 638 set_target_properties(${WebKit2_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 639 640 install(TARGETS ${WebKit2_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}") 641 install(TARGETS ${WebProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}") 623 add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES}) 624 625 add_dependencies(WebKit2 WebCore) 626 add_dependencies(WebKit2 ${ForwardingHeaders_NAME}) 627 add_dependencies(WebKit2 ${ForwardingNetworkHeaders_NAME}) 628 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES}) 629 set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit") 630 set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "") 631 632 if (WebKit2_OUTPUT_NAME) 633 set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME}) 634 endif () 635 636 add_executable(WebProcess ${WebProcess_SOURCES}) 637 target_link_libraries(WebProcess ${WebProcess_LIBRARIES}) 638 set_target_properties(WebProcess PROPERTIES FOLDER "WebKit") 639 640 set_target_properties(WebKit2 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 641 642 install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}") 643 install(TARGETS WebProcess DESTINATION "${EXEC_INSTALL_DIR}") -
trunk/Source/WebKit2/ChangeLog
r150334 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * CMakeLists.txt: 13 * PlatformEfl.cmake: 14 * efl/ewebkit2.pc.in: 15 1 16 2013-05-18 Carlos Garcia Campos <cgarcia@igalia.com> 2 17 -
trunk/Source/WebKit2/PlatformEfl.cmake
r149073 r150336 341 341 342 342 install(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig) 343 install(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_ LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})343 install(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}) 344 344 345 345 if (ENABLE_PLUGIN_PROCESS) 346 346 add_definitions(-DENABLE_PLUGIN_PROCESS=1) 347 347 348 set(PluginProcess_EXECUTABLE_NAME PluginProcess)349 348 list(APPEND PluginProcess_INCLUDE_DIRECTORIES 350 349 "${WEBKIT2_DIR}/PluginProcess/unix" … … 358 357 359 358 set(PluginProcess_LIBRARIES 360 ${WebKit2_LIBRARY_NAME}361 ) 362 363 add_executable( ${PluginProcess_EXECUTABLE_NAME}${PluginProcess_SOURCES})364 target_link_libraries( ${PluginProcess_EXECUTABLE_NAME}${PluginProcess_LIBRARIES})365 install(TARGETS ${PluginProcess_EXECUTABLE_NAME}DESTINATION "${EXEC_INSTALL_DIR}")359 WebKit2 360 ) 361 362 add_executable(PluginProcess ${PluginProcess_SOURCES}) 363 target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES}) 364 install(TARGETS PluginProcess DESTINATION "${EXEC_INSTALL_DIR}") 366 365 endif () # ENABLE_PLUGIN_PROCESS 367 366 … … 369 368 370 369 set(EWK2UnitTests_LIBRARIES 371 ${WTF_LIBRARY_NAME}372 ${JavaScriptCore_LIBRARY_NAME}373 ${WebCore_LIBRARY_NAME}374 ${WebKit2_LIBRARY_NAME}370 WTF 371 JavaScriptCore 372 WebCore 373 WebKit2 375 374 ${CAIRO_LIBRARIES} 376 375 ${ECORE_LIBRARIES} … … 393 392 -DGTEST_LINKED_AS_SHARED_LIBRARY=1 394 393 -DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\" 395 -DWEBPROCESSNAME=\" ${WebProcess_EXECUTABLE_NAME}\"396 -DPLUGINPROCESSNAME=\" ${PluginProcess_EXECUTABLE_NAME}\"394 -DWEBPROCESSNAME=\"WebProcess\" 395 -DPLUGINPROCESSNAME=\"PluginProcess\" 397 396 ) 398 397 … … 446 445 447 446 add_library(ewk2UnitTestInjectedBundleSample SHARED ${TEST_INJECTED_BUNDLE_DIR}/injected_bundle_sample.cpp) 448 target_link_libraries(ewk2UnitTestInjectedBundleSample ${WebKit2_LIBRARY_NAME})447 target_link_libraries(ewk2UnitTestInjectedBundleSample WebKit2) 449 448 endif () 450 449 -
trunk/Source/WebKit2/efl/ewebkit2.pc.in
r132063 r150336 11 11 Libs: -L${libdir} -lewebkit2 12 12 Libs.private: @LIBS_PRIVATE@ 13 Cflags: -I${includedir}/@WebKit2_ LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@13 Cflags: -I${includedir}/@WebKit2_OUTPUT_NAME@-@PROJECT_VERSION_MAJOR@ -
trunk/Source/cmake/OptionsBlackBerry.cmake
r149638 r150336 143 143 include_directories(${CMAKE_INCLUDE_PATH}) 144 144 145 set(JSC_EXECUTABLE_NAME jsc) 146 147 set(WTF_LIBRARY_NAME wtf) 148 set(JavaScriptCore_LIBRARY_NAME javascriptcore) 149 set(WebCore_LIBRARY_NAME webcore) 150 set(WebKit_LIBRARY_NAME webkit) 151 set(WebKit_DRT_LIBRARY_NAME webkit_DRT) 145 set(WTF_OUTPUT_NAME wtf) 146 set(JavaScriptCore_OUTPUT_NAME javascriptcore) 147 set(WebCore_OUTPUT_NAME webcore) 148 set(WebKit_OUTPUT_NAME webkit) 149 set(WebKit_DRT_OUTPUT_NAME webkit_DRT) 152 150 153 151 WEBKIT_OPTION_BEGIN() -
trunk/Source/cmake/OptionsEfl.cmake
r150335 r150336 37 37 add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1) 38 38 39 set(JSC_EXECUTABLE_NAME jsc) 40 41 set(WTF_LIBRARY_NAME wtf_efl) 42 set(JavaScriptCore_LIBRARY_NAME javascriptcore_efl) 43 set(WebCore_LIBRARY_NAME webcore_efl) 44 set(WebKit_LIBRARY_NAME ewebkit) 45 set(WebKit2_LIBRARY_NAME ewebkit2) 46 47 set(DATA_INSTALL_DIR "share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data") 39 set(WTF_OUTPUT_NAME wtf_efl) 40 set(JavaScriptCore_OUTPUT_NAME javascriptcore_efl) 41 set(WebCore_OUTPUT_NAME webcore_efl) 42 set(WebKit_OUTPUT_NAME ewebkit) 43 set(WebKit2_OUTPUT_NAME ewebkit2) 44 45 set(DATA_INSTALL_DIR "share/${WebKit_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data") 48 46 set(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebCore/platform/efl/DefaultTheme) 49 47 file(MAKE_DIRECTORY ${THEME_BINARY_DIR}) -
trunk/Source/cmake/OptionsGTK.cmake
r150192 r150336 78 78 set(WTF_USE_ICU_UNICODE 1) 79 79 set(WTF_USE_SOUP 1) 80 set(WTF_USE_ICU_UNICODE 1)81 80 82 set(JSC_EXECUTABLE_NAME jsc) 83 set(WTF_LIBRARY_NAME WTFGTK) 84 set(JavaScriptCore_LIBRARY_NAME javascriptcoregtk) 85 set(WebCore_LIBRARY_NAME WebCoreGTK) 86 set(WebKit_LIBRARY_NAME webkitgtk-3.0) 87 set(WebKit2_LIBRARY_NAME webkit2gtk-3.0) 81 set(WTF_OUTPUT_NAME WTFGTK) 82 set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk) 83 set(WebCore_OUTPUT_NAME WebCoreGTK) 84 set(WebKit_OUTPUT_NAME webkitgtk-3.0) 85 set(WebKit2_OUTPUT_NAME webkit2gtk-3.0) 88 86 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") 89 87 90 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_ LIBRARY_NAME}")88 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}") 91 89 set(DATA_INSTALL_DIR "${DATADIR}/webkitgtk-3.0") 92 90 -
trunk/Source/cmake/WebKitHelpers.cmake
r149266 r150336 52 52 endif () 53 53 54 if ("${_target}" MATCHES " ${WebKit2_LIBRARY_NAME}")54 if ("${_target}" MATCHES "WebKit2") 55 55 set(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -std=c++0x") 56 56 endif () -
trunk/Source/cmake/gtest/CMakeLists.txt
r136790 r150336 25 25 26 26 target_link_libraries(gtest 27 ${WTF_LIBRARY_NAME}27 WTF 28 28 ) 29 29 -
trunk/Tools/ChangeLog
r150335 r150336 1 2013-05-18 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME 4 https://bugs.webkit.org/show_bug.cgi?id=114554 5 6 Reviewed by Gyuyoung Kim. 7 8 Using variables as target names is very uncommon in CMake. 9 The usual way to specify the name of the resulting binary 10 is to set the OUTPUT_NAME target property. 11 12 * DumpRenderTree/efl/CMakeLists.txt: 13 * EWebLauncher/CMakeLists.txt: 14 * ImageDiff/CMakeLists.txt: 15 * MiniBrowser/efl/CMakeLists.txt: 16 * TestWebKitAPI/CMakeLists.txt: 17 * WebKitTestRunner/CMakeLists.txt: 18 * WebKitTestRunner/PlatformEfl.cmake: 19 * WinCELauncher/CMakeLists.txt: 20 1 21 2013-05-18 Christophe Dumez <ch.dumez@sisa.samsung.com> 2 22 -
trunk/Tools/DumpRenderTree/efl/CMakeLists.txt
r148025 r150336 31 31 32 32 set(DumpRenderTree_LIBRARIES 33 ${JavaScriptCore_LIBRARY_NAME}34 ${WebCoreTestSupport_LIBRARY_NAME}35 ${WebCore_LIBRARY_NAME}36 ${WebKit_LIBRARY_NAME}37 ${WTF_LIBRARY_NAME}33 JavaScriptCore 34 WebCoreTestSupport 35 WebCore 36 WebKit 37 WTF 38 38 ${CAIRO_LIBRARIES} 39 39 ${ECORE_LIBRARIES} -
trunk/Tools/EWebLauncher/CMakeLists.txt
r148025 r150336 6 6 7 7 set(EWebLauncher_LIBRARIES 8 ${JavaScriptCore_LIBRARY_NAME}9 ${WebCore_LIBRARY_NAME}10 ${WebKit_LIBRARY_NAME}8 JavaScriptCore 9 WebCore 10 WebKit 11 11 ${CAIRO_LIBRARIES} 12 12 ${ECORE_LIBRARIES} -
trunk/Tools/ImageDiff/CMakeLists.txt
r138158 r150336 7 7 8 8 set(IMAGE_DIFF_LIBRARIES 9 ${WTF_LIBRARY_NAME}9 WTF 10 10 ) 11 11 -
trunk/Tools/MiniBrowser/efl/CMakeLists.txt
r148025 r150336 33 33 34 34 set(MiniBrowser_LIBRARIES 35 ${JavaScriptCore_LIBRARY_NAME}36 ${WebCore_LIBRARY_NAME}37 ${WebKit2_LIBRARY_NAME}35 JavaScriptCore 36 WebCore 37 WebKit2 38 38 ${CAIRO_LIBRARIES} 39 39 ${ECORE_LIBRARIES} -
trunk/Tools/TestWebKitAPI/CMakeLists.txt
r148931 r150336 52 52 ) 53 53 54 target_link_libraries(TestWebKitAPIInjectedBundle ${WTF_LIBRARY_NAME})55 add_dependencies(TestWebKitAPIInjectedBundle ${WebKit2_LIBRARY_NAME}${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})54 target_link_libraries(TestWebKitAPIInjectedBundle WTF) 55 add_dependencies(TestWebKitAPIInjectedBundle WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME}) 56 56 57 57 get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION) … … 63 63 64 64 set(test_wtf_LIBRARIES 65 ${WTF_LIBRARY_NAME}65 WTF 66 66 gtest 67 67 ) … … 99 99 set(test_webcore_LIBRARIES 100 100 gtest 101 ${WTF_LIBRARY_NAME}102 ${WebCore_LIBRARY_NAME}101 WTF 102 WebCore 103 103 ) 104 104 … … 118 118 ) 119 119 120 add_dependencies(TestWebKitAPIBase ${WebKit2_LIBRARY_NAME}${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})120 add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME}) 121 121 122 122 set(test_webkit2_api_LIBRARIES 123 123 TestWebKitAPIBase 124 ${WTF_LIBRARY_NAME}125 ${JavaScriptCore_LIBRARY_NAME}126 ${WebKit2_LIBRARY_NAME}124 WTF 125 JavaScriptCore 126 WebKit2 127 127 gtest 128 128 ) -
trunk/Tools/WebKitTestRunner/CMakeLists.txt
r147081 r150336 15 15 16 16 set(WebKitTestRunner_LIBRARIES 17 ${JavaScriptCore_LIBRARY_NAME}18 ${WebCore_LIBRARY_NAME}19 ${WebCoreTestSupport_LIBRARY_NAME}20 ${WebKit2_LIBRARY_NAME}17 JavaScriptCore 18 WebCore 19 WebCoreTestSupport 20 WebKit2 21 21 ) 22 22 … … 96 96 target_link_libraries(WebKitTestRunner ${WebKitTestRunner_LIBRARIES}) 97 97 98 add_dependencies( ${WebKit2_LIBRARY_NAME}${ForwardingHeadersForWebKitTestRunner_NAME})99 add_dependencies( ${WebKit2_LIBRARY_NAME}${ForwardingNetworkHeadersForWebKitTestRunner_NAME})98 add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME}) 99 add_dependencies(WebKit2 ${ForwardingNetworkHeadersForWebKitTestRunner_NAME}) -
trunk/Tools/WebKitTestRunner/PlatformEfl.cmake
r148025 r150336 41 41 ${GLIB_LIBRARIES} 42 42 ${OPENGL_LIBRARIES} 43 ${WTF_LIBRARY_NAME}43 WTF 44 44 ) 45 45 -
trunk/Tools/WinCELauncher/CMakeLists.txt
r141702 r150336 17 17 18 18 set(WinCELauncher_LIBRARIES 19 ${WebKit_LIBRARY_NAME}19 WebKit 20 20 ) 21 21 22 22 include_directories(${WinCELauncher_INCLUDE_DIRECTORIES}) 23 23 add_executable(WinCELauncher WIN32 ${WinCELauncher_SOURCES}) 24 add_dependencies(WinCELauncher ${WebKit_LIBRARY_NAME})24 add_dependencies(WinCELauncher WebKit) 25 25 target_link_libraries(WinCELauncher ${WinCELauncher_LIBRARIES}) 26 26 set_target_properties(WinCELauncher PROPERTIES FOLDER "Tools")
Note: See TracChangeset
for help on using the changeset viewer.