[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/unity/WebKit/WebCore
From: Allan Sandfeld Jensen <kde () carewolf ! com>
Date: 2006-07-13 20:46:45
Message-ID: 1152823605.476403.11961.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 562000 by carewolf:
Link and compile goddamn it
M +16 -17 CMakeLists.txt
--- branches/work/unity/WebKit/WebCore/CMakeLists.txt #561999:562000
@@ -5,8 +5,8 @@
include_directories(
BEFORE ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/ForwardingHeaders
- ${CMAKE_CURRENT_SOURCE_DIR}/platform
+ ${CMAKE_CURRENT_SOURCE_DIR}/ForwardingHeaders
+ ${CMAKE_CURRENT_SOURCE_DIR}/platform
${CMAKE_CURRENT_SOURCE_DIR}/loader
${CMAKE_CURRENT_BINARY_DIR}/css
${CMAKE_CURRENT_SOURCE_DIR}/css
@@ -33,13 +33,12 @@
${CMAKE_CURRENT_SOURCE_DIR}/platform/qt
${CMAKE_CURRENT_SOURCE_DIR}/../JavaScriptCore/kjs
${CMAKE_CURRENT_SOURCE_DIR}/../JavaScriptCore/
- ${CMAKE_CURRENT_SOURCE_DIR}/../JavaScriptCore/icu
- ${CMAKE_CURRENT_SOURCE_DIR}/../
+ ${CMAKE_CURRENT_SOURCE_DIR}/../
)
include_directories( ${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES}
# don't. pulls in kjs
- # ${KDE4_KDECORE_INCLUDES}
+ # ${KDE4_KDECORE_INCLUDES}
)
kde4_automoc(platform/qt/CanvasQt.cpp)
@@ -186,7 +185,7 @@
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/css/CSSPropertyNames.in \
${CMAKE_CURRENT_BINARY_DIR}/CSSPropertyNames.in COMMAND sh \
${CMAKE_CURRENT_SOURCE_DIR}/css/makeprop
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/css/CSSPropertyNames.in
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/css/CSSPropertyNames.in
)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CSSValueKeywords.h \
${CMAKE_CURRENT_BINARY_DIR}/CSSValueKeywords.c @@ -212,7 +211,7 @@
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/html
COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/ksvg2/scripts/make_names.pl --tags \
${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLTagNames.in --attrs \
${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLAttributeNames.in --namespace HTML \
--namespacePrefix xhtml --cppNamespace WebCore --namespaceURI \
"http://www.w3.org/1999/xhtml" --attrsNullNamespace --output html
-
+
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLTagNames.in \
${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLAttributeNames.in )
@@ -255,12 +254,12 @@
)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheets.h \
${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheetsData.cpp
- COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/css/make-css-file-arrays.pl \
${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheets.h \
${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheetsData.cpp \
${CMAKE_CURRENT_SOURCE_DIR}/css/html4.css ${CMAKE_CURRENT_SOURCE_DIR}/css/quirks.css \
${CMAKE_CURRENT_SOURCE_DIR}/css/svg.css + COMMAND perl \
${CMAKE_CURRENT_SOURCE_DIR}/css/make-css-file-arrays.pl \
${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheets.h \
${CMAKE_CURRENT_BINARY_DIR}/UserAgentStyleSheetsData.cpp \
${CMAKE_CURRENT_SOURCE_DIR}/css/html4.css ${CMAKE_CURRENT_SOURCE_DIR}/css/quirks.css \
${CMAKE_CURRENT_SOURCE_DIR}/css/svg.css DEPENDS \
${CMAKE_CURRENT_SOURCE_DIR}/css/html4.css ${CMAKE_CURRENT_SOURCE_DIR}/css/quirks.css \
${CMAKE_CURRENT_SOURCE_DIR}/css/svg.css )
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CharacterData.cpp
- COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/platform/make-charset-table.pl \
${CMAKE_CURRENT_SOURCE_DIR}/platform/character-sets.txt \
${CMAKE_CURRENT_SOURCE_DIR}/platform/qt/qt-encodings.txt \" \" > \
${CMAKE_CURRENT_BINARY_DIR}/CharacterData.cpp +add_custom_command(OUTPUT \
${CMAKE_CURRENT_BINARY_DIR}/CharacterData.cpp + COMMAND perl \
${CMAKE_CURRENT_SOURCE_DIR}/platform/make-charset-table.pl \
${CMAKE_CURRENT_SOURCE_DIR}/platform/character-sets.txt \
${CMAKE_CURRENT_SOURCE_DIR}/platform/qt/qt-encodings.txt \" \" > \
${CMAKE_CURRENT_BINARY_DIR}/CharacterData.cpp DEPENDS \
${CMAKE_CURRENT_SOURCE_DIR}/platform/make-charset-table.pl \
${CMAKE_CURRENT_SOURCE_DIR}/platform/character-sets.txt )
@@ -437,7 +436,7 @@
${WebCore-unity_LIB_SRCS}
- ${CMAKE_CURRENT_BINARY_DIR}/CSSPropertyNames.h
+ ${CMAKE_CURRENT_BINARY_DIR}/CSSPropertyNames.h
${CMAKE_CURRENT_BINARY_DIR}/CSSValueKeywords.h
${CMAKE_CURRENT_BINARY_DIR}/CSSGrammar.h
${CMAKE_CURRENT_BINARY_DIR}/CSSGrammar.cpp
@@ -966,19 +965,19 @@
target_link_libraries(WebCore-unity
- ${QT_QT3SUPPORT_LIBRARY}
+ ${QT_QT3SUPPORT_LIBRARY}
${QT_QTCORE_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTGUI_LIBRARY}
+ ${QT_QTSVG_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
${LIBXSLT_LIBRARIES}
${LIBXML2_LIBRARIES}
${JPEG_LIBRARY}
${PNG_LIBRARY}
icuuc
curl
- wtf-unity
- kjs-unity
- pcre-unity
+ wtf-unity
+ kjs-unity
+ pcre-unity
)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic