Commit 8498ce97 authored by paroga@webkit.org's avatar paroga@webkit.org

2010-12-29 Patrick Gansterer <paroga@webkit.org>

        Unreviewed. Use gcc as default preprocessor.

        * Sources/cmake/OptionsCommon.cmake:
2010-12-29  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Remove WebKitGenerators
        https://bugs.webkit.org/show_bug.cgi?id=50445

        * CMakeLists.txt: Pass preprocessor to generate-bindings.pl.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74739 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0ef796c8
2010-12-29 Patrick Gansterer <paroga@webkit.org>
Unreviewed. Use gcc as default preprocessor.
* Sources/cmake/OptionsCommon.cmake:
2010-12-27 Ryuan Choi <ryuan.choi@samsung.com> 2010-12-27 Ryuan Choi <ryuan.choi@samsung.com>
Reviewed by David Levin. Reviewed by David Levin.
......
...@@ -13,7 +13,7 @@ IF (WTF_OS_UNIX) ...@@ -13,7 +13,7 @@ IF (WTF_OS_UNIX)
ENDIF (WTF_OS_UNIX) ENDIF (WTF_OS_UNIX)
IF (MSVC) IF (MSVC)
SET(CODE_GENERATOR_PREPROCESSOR "cl.exe /nologo /EP") SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} /nologo /EP")
ELSE () ELSE ()
SET(CODE_GENERATOR_PREPROCESSOR "cpp") SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
ENDIF () ENDIF ()
...@@ -2074,7 +2074,7 @@ FOREACH (_file ${WebCore_IDL_FILES}) ...@@ -2074,7 +2074,7 @@ FOREACH (_file ${WebCore_IDL_FILES})
OUTPUT ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h OUTPUT ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h
MAIN_DEPENDENCY ${_file} MAIN_DEPENDENCY ${_file}
DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${_file} DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} ${_file}
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" ${WEBCORE_DIR}/${_file} COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator JS ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/${_file}
VERBATIM) VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/JS${_name}.cpp) LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/JS${_name}.cpp)
ENDFOREACH () ENDFOREACH ()
...@@ -2085,7 +2085,7 @@ ADD_CUSTOM_COMMAND( ...@@ -2085,7 +2085,7 @@ ADD_CUSTOM_COMMAND(
OUTPUT ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h OUTPUT ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.h
MAIN_DEPENDENCY inspector/Inspector.idl MAIN_DEPENDENCY inspector/Inspector.idl
DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} inspector/Inspector.idl DEPENDS ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl ${SCRIPTS_BINDINGS} inspector/Inspector.idl
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" ${WEBCORE_DIR}/inspector/Inspector.idl COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --generator Inspector ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${WEBCORE_DIR}/inspector/Inspector.idl
VERBATIM) VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp) LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/InspectorFrontend.cpp)
......
2010-12-29 Patrick Gansterer <paroga@webkit.org>
Reviewed by Andreas Kling.
[CMake] Remove WebKitGenerators
https://bugs.webkit.org/show_bug.cgi?id=50445
* CMakeLists.txt: Pass preprocessor to generate-bindings.pl.
2010-12-28 Pratik Solanki <psolanki@apple.com> 2010-12-28 Pratik Solanki <psolanki@apple.com>
Reviewed by Eric Seidel. Reviewed by Eric Seidel.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment