2010-08-14 Patrick Gansterer <paroga@paroga.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Aug 2010 16:34:26 +0000 (16:34 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Aug 2010 16:34:26 +0000 (16:34 +0000)
        Reviewed by Kenneth Rohde Christiansen.

        [CMake] Add preprocessor detection for generator scripts
        https://bugs.webkit.org/show_bug.cgi?id=43984

        * cmake/OptionsCommon.cmake:
2010-08-14  Patrick Gansterer  <paroga@paroga.com>

        Reviewed by Kenneth Rohde Christiansen.

        [CMake] Add preprocessor detection for generator scripts
        https://bugs.webkit.org/show_bug.cgi?id=43984

        * CMakeLists.txt:

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

ChangeLog
JavaScriptCore/CMakeLists.txt
JavaScriptCore/ChangeLog
cmake/OptionsCommon.cmake

index a3ccbf1..e9f3b78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-14  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [CMake] Add preprocessor detection for generator scripts
+        https://bugs.webkit.org/show_bug.cgi?id=43984
+
+        * cmake/OptionsCommon.cmake:
+
 2010-08-14  Adrienne Walker  <enne@google.com>
 
         Reviewed by Kenneth Rohde Christiansen.
index 4a84dec..f69cede 100644 (file)
@@ -203,13 +203,10 @@ GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_
 LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h)
 
 # GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
-IF (MSVC)
-    SET(JSC_DFTABLES_PREPROCESSOR --preprocessor=cl.exe)
-ENDIF ()
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_DIR}/chartables.c
     MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/pcre/dftables
-    COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables ${JSC_DFTABLES_PREPROCESSOR} ${DERIVED_SOURCES_DIR}/chartables.c
+    COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_DIR}/chartables.c
     VERBATIM)
 ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/pcre/pcre_tables.cpp ${DERIVED_SOURCES_DIR}/chartables.c)
 
index fa48da0..7418c38 100644 (file)
@@ -2,6 +2,15 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [CMake] Add preprocessor detection for generator scripts
+        https://bugs.webkit.org/show_bug.cgi?id=43984
+
+        * CMakeLists.txt:
+
+2010-08-14  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [CMake] Set target properties only if available
         https://bugs.webkit.org/show_bug.cgi?id=43978
 
index b0d0375..8b0b9c3 100644 (file)
@@ -16,3 +16,9 @@ SET(WTF_INCLUDE_DIRECTORIES
 IF (WTF_OS_UNIX)
     ADD_DEFINITIONS(-DXP_UNIX)
 ENDIF (WTF_OS_UNIX)
+
+IF (MSVC)
+    SET(CODE_GENERATOR_PREPROCESSOR "cl.exe /nologo /EP")
+ELSE ()
+    SET(CODE_GENERATOR_PREPROCESSOR "cpp")
+ENDIF ()