+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2017-07-17 Konstantin Tokarev <annulen@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
COMMAND ${PYTHON_EXECUTABLE} ${_generator} ${_input} ${_output}
VERBATIM)
list(APPEND JavaScriptCore_HEADERS ${_output})
- ADD_SOURCE_DEPENDENCIES(${_input} ${_output})
+ WEBKIT_ADD_SOURCE_DEPENDENCIES(${_input} ${_output})
endmacro()
GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmOpsHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WasmOps.h)
GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmValidateInlinesHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WasmValidateInlines.h)
COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} > ${_output}
VERBATIM)
list(APPEND JavaScriptCore_HEADERS ${_output})
- ADD_SOURCE_DEPENDENCIES(${_input} ${_output})
+ WEBKIT_ADD_SOURCE_DEPENDENCIES(${_input} ${_output})
endmacro()
# GENERATOR 1-A: LUT creator
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
VERBATIM)
-ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
+WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/YarrCanonicalizeUnicode.cpp
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
VERBATIM)
-ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
+WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
# Inspector Interfaces
if (NOT "${PORT}" STREQUAL "Mac")
if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
- POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
+ WEBKIT_POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
endif ()
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * shell/CMakeLists.txt:
+
2017-07-17 Saam Barati <sbarati@apple.com>
Remove custom defined RELEASE_ASSERT in DFGObjectAllocationSinkingPhase
endif ()
if (JSC_LINK_FLAGS)
- ADD_TARGET_PROPERTIES(jsc LINK_FLAGS "${JSC_LINK_FLAGS}")
+ WEBKIT_ADD_TARGET_PROPERTIES(jsc LINK_FLAGS "${JSC_LINK_FLAGS}")
endif ()
if (SHOULD_INSTALL_JS_SHELL)
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * brotli/CMakeLists.txt:
+ * woff2/CMakeLists.txt:
+ * xdgmime/CMakeLists.txt:
+
2017-07-13 Michael Catanzaro <mcatanzaro@igalia.com>
Fix compiler warnings when building with GCC 7
WEBKIT_SET_EXTRA_COMPILER_FLAGS(brotli)
if (COMPILER_IS_GCC_OR_CLANG)
- ADD_TARGET_PROPERTIES(brotli COMPILE_FLAGS "-Wno-cast-align -Wno-implicit-fallthrough")
+ WEBKIT_ADD_TARGET_PROPERTIES(brotli COMPILE_FLAGS "-Wno-cast-align -Wno-implicit-fallthrough")
endif ()
WEBKIT_SET_EXTRA_COMPILER_FLAGS(woff2)
if (COMPILER_IS_GCC_OR_CLANG)
- ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-variable -Wno-unused-parameter")
+ WEBKIT_ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-variable -Wno-unused-parameter")
endif ()
if (CMAKE_COMPILER_IS_GNUCXX)
- ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-unused-but-set-variable")
+ WEBKIT_ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-unused-but-set-variable")
endif ()
WEBKIT_SET_EXTRA_COMPILER_FLAGS(xdgmime)
if (COMPILER_IS_GCC_OR_CLANG)
- ADD_TARGET_PROPERTIES(xdgmime COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
+ WEBKIT_ADD_TARGET_PROPERTIES(xdgmime COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
endif ()
WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
if (MSVC)
- ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
- ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCoreDerivedSourcesPrefix.cpp" WebCore_DERIVED_SOURCES)
+ WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
+ WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCoreDerivedSourcesPrefix.cpp" WebCore_DERIVED_SOURCES)
endif ()
# This is split into a separate library as a workaround for command line length
# See https://bugs.webkit.org/show_bug.cgi?id=146440
string(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR)
if (CMAKE_COMPILER_IS_GNUCXX AND "${LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR}" MATCHES "(i[3-6]86|x86)$")
- ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
+ WEBKIT_ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
endif ()
if (MSVC)
- ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
+ WEBKIT_ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
# Suppress null conversion warnings for sources in Source/ThirdParty/ANGLE
if (COMPILER_IS_CLANG)
- ADD_TARGET_PROPERTIES(ANGLESupport COMPILE_FLAGS "-Wno-null-conversion")
+ WEBKIT_ADD_TARGET_PROPERTIES(ANGLESupport COMPILE_FLAGS "-Wno-null-conversion")
endif ()
# Enable the ESSL and GLSL translators.
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * WebCoreMacros.cmake:
+
2017-07-17 Alex Christensen <achristensen@webkit.org>
Modernize content extension code
list(APPEND _tmp "${DERIVED_SOURCES_WEBCORE_DIR}/${f}")
endforeach ()
- ADD_SOURCE_DEPENDENCIES(${_source} ${_tmp})
+ WEBKIT_ADD_SOURCE_DEPENDENCIES(${_source} ${_tmp})
unset(_tmp)
endmacro()
DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/make-js-file-arrays.py ${${_scripts}}
COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/make-js-file-arrays.py -n ${_namespace} ${_output_h} ${_output_cpp} ${${_scripts}}
VERBATIM)
- ADD_SOURCE_DEPENDENCIES(${${_scripts_dependencies}} ${_output_h} ${_output_cpp})
+ WEBKIT_ADD_SOURCE_DEPENDENCIES(${${_scripts_dependencies}} ${_output_h} ${_output_cpp})
endmacro()
# Suppress unused parameter warnings for sources in WebKit2.
if (COMPILER_IS_GCC_OR_CLANG)
- ADD_TARGET_PROPERTIES(WebKit2 COMPILE_FLAGS "-Wno-unused-parameter")
+ WEBKIT_ADD_TARGET_PROPERTIES(WebKit2 COMPILE_FLAGS "-Wno-unused-parameter")
endif ()
if (WebKit2_VERSION_SCRIPT)
- ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
+ WEBKIT_ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
endif ()
add_executable(WebProcess ${WebProcess_SOURCES})
set_target_properties(NetworkProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_net_xpc_dir}/MacOS")
else ()
- POPULATE_LIBRARY_VERSION(WEBKIT2)
+ WEBKIT_POPULATE_LIBRARY_VERSION(WEBKIT2)
set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
install(TARGETS WebKit2 WebProcess NetworkProcess
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2017-07-17 Alex Christensen <achristensen@webkit.org>
Modernize content extension code
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
if (MSVC)
- ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
+ WEBKIT_ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
list(APPEND WebKit_SOURCES win/WebKit.resources/WebKit.rc)
add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit)
endif ()
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2017-07-17 Konstantin Tokarev <annulen@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
endmacro()
# Append the given dependencies to the source file
-macro(ADD_SOURCE_DEPENDENCIES _source _deps)
+macro(WEBKIT_ADD_SOURCE_DEPENDENCIES _source _deps)
set(_tmp)
get_source_file_property(_tmp ${_source} OBJECT_DEPENDS)
if (NOT _tmp)
unset(_tmp)
endmacro()
-macro(ADD_PRECOMPILED_HEADER _header _cpp _source)
+macro(WEBKIT_ADD_PRECOMPILED_HEADER _header _cpp _source)
if (MSVC)
get_filename_component(PrecompiledBasename ${_cpp} NAME_WE)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_source}")
PROPERTIES COMPILE_FLAGS "/Yu\"${_header}\" /FI\"${_header}\" /Fp\"${PrecompiledBinary}\"")
foreach (_src ${_sources})
- ADD_SOURCE_DEPENDENCIES(${_src} ${PrecompiledBinary})
+ WEBKIT_ADD_SOURCE_DEPENDENCIES(${_src} ${PrecompiledBinary})
endforeach ()
list(APPEND ${_source} ${_cpp})
# Append the given flag to the target property.
# Builds on top of get_target_property() and set_target_properties()
-macro(ADD_TARGET_PROPERTIES _target _property _flags)
+macro(WEBKIT_ADD_TARGET_PROPERTIES _target _property _flags)
get_target_property(_tmp ${_target} ${_property})
if (NOT _tmp)
set(_tmp "")
set_target_properties(${_target} PROPERTIES ${_property} ${_tmp})
unset(_tmp)
-endmacro(ADD_TARGET_PROPERTIES _target _property _flags)
+endmacro()
-macro(POPULATE_LIBRARY_VERSION library_name)
+macro(WEBKIT_POPULATE_LIBRARY_VERSION library_name)
if (NOT DEFINED ${library_name}_VERSION_MAJOR)
set(${library_name}_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
endif ()
+2017-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
+ https://bugs.webkit.org/show_bug.cgi?id=174547
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+
2017-07-17 Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com>
Update style checker to deal with "final"
)
endif ()
-ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
+WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugIn)
# Suppress unused parameter warnings for sources in WebKit2.
-ADD_TARGET_PROPERTIES(TestNetscapePlugIn COMPILE_FLAGS "-Wno-unused-parameter")
+WEBKIT_ADD_TARGET_PROPERTIES(TestNetscapePlugIn COMPILE_FLAGS "-Wno-unused-parameter")