Reviewed by Tim H.
Commit KDE related tweaks, to be able to
differentiate between a Qt-only or a KDE build.
* CMakeLists.txt: Install wtf-unity library.
* wtf/Platform.h: Add define for the KDE platform.
WebCore:
Reviewed by Tim H.
Commit KDE related tweaks, to be able to
differentiate between a Qt-only or a KDE build.
* CMakeLists.txt: Move global variables up to trunk/CMakeLists.txt.
Also rename USE_WEBKIT_SVG_SUPPORT to WEBKIT_USE_SVG_SUPPORT.
WebKitTools:
Reviewed by Tim H.
Commit KDE related tweaks, to be able to
differentiate between a Qt-only or a KDE build.
* DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Add ksvg2/ includes.
* QtLauncher/CMakeLists.txt: Add ksvg2/ includes.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16115
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+project (WebKit)
-project( WebKit )
+# Qt support is always enabled!
+add_definitions (-DBUILDING_QT__=1)
+
+# Global switch for KDE support
+OPTION (WEBKIT_USE_KDE_SUPPORT "Compile WebKit with KDE support." ON)
+
+IF (WEBKIT_USE_KDE_SUPPORT)
+ add_definitions (-DBUILDING_KDE__=1)
+ENDIF (WEBKIT_USE_KDE_SUPPORT)
+
+# Global switch for SVG support
+OPTION (WEBKIT_USE_SVG_SUPPORT "Compile WebKit with SVG support." ON)
+
+IF (WEBKIT_USE_SVG_SUPPORT)
+ add_definitions (-DSVG_SUPPORT=1)
+ENDIF (WEBKIT_USE_SVG_SUPPORT)
# search packages used by KDE
-find_package(KDE4 REQUIRED)
+find_package (KDE4 REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
-find_package(LibXml2 REQUIRED)
-find_package(LibXslt REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(PNG REQUIRED)
+find_package (LibXml2 REQUIRED)
+find_package (LibXslt REQUIRED)
+find_package (JPEG REQUIRED)
+find_package (PNG REQUIRED)
-find_program(BISON_EXECUTABLE bison)
-find_program(GPERF_EXECUTABLE gperf)
+find_program (BISON_EXECUTABLE bison)
+find_program (GPERF_EXECUTABLE gperf)
# quick check the libicu is available
find_path(LIBICU_INCLUDE_DIR unicode/umachine.h )
link_directories (${KDE4_LIB_DIR})
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${LIBICU_INCLUDE_DIR})
-add_definitions( -fpermissive )
-add_definitions( -DUSE_SYSTEM_MALLOC=1 )
-
-# Once we use KDE stuff, adjust wtf/Platform.h for BUILDING_KDE__ ...
-add_definitions( -DBUILDING_QT__=1 )
-
-add_subdirectory( JavaScriptCore )
-add_subdirectory( WebCore )
-add_subdirectory( WebKitTools/QtLauncher )
-add_subdirectory( WebKitTools/DumpRenderTree/DumpRenderTree.qtproj )
+add_definitions (-fpermissive)
+add_definitions (-DUSE_SYSTEM_MALLOC=1)
-include_directories ( BEFORE ${CMAKE_CURRENT_BINARY_DIR} )
+add_subdirectory (JavaScriptCore)
+add_subdirectory (WebCore)
+add_subdirectory (WebKitTools/QtLauncher)
+add_subdirectory (WebKitTools/DumpRenderTree/DumpRenderTree.qtproj)
+include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(kjs-unity wtf-unity)
set_target_properties(kjs-unity PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kjs-unity DESTINATION ${LIB_INSTALL_DIR} )
+
+install (TARGETS wtf-unity DESTINATION ${LIB_INSTALL_DIR})
+install (TARGETS kjs-unity DESTINATION ${LIB_INSTALL_DIR})
+2006-08-30 Nikolas Zimmermann <zimmermann@kde.org>
+
+ Reviewed by Tim H.
+
+ Commit KDE related tweaks, to be able to
+ differentiate between a Qt-only or a KDE build.
+
+ * CMakeLists.txt: Install wtf-unity library.
+ * wtf/Platform.h: Add define for the KDE platform.
+
2006-08-28 Darin Adler <darin@apple.com>
Reviewed by Geoff.
/* PLATFORM(WIN) */
#if defined(BUILDING_QT__)
#define KXMLCORE_PLATFORM_QT 1
+
+/* PLATFORM(KDE) */
+#if defined(BUILDING_KDE__)
+#define KXMLCORE_PLATFORM_KDE 1
+#endif
+
#elif PLATFORM(DARWIN)
#define KXMLCORE_PLATFORM_MAC 1
#elif PLATFORM(WIN_OS)
/* for Unicode, KDE uses Qt, everything else uses ICU */
#if PLATFORM(KDE)
-#define KXMLCORE_USE_QT4_UNICODE 1
+// FIXME: Not using Qt4 unicode for now!
+#define KXMLCORE_USE_ICU_UNICODE 1
#else
#define KXMLCORE_USE_ICU_UNICODE 1
#endif
project( WebCore )
-# Global switch for SVG support
-SET (USE_WEBKIT_SVG_SUPPORT 1)
-
include (CheckCXXCompilerFlag)
include_directories(
)
add_definitions ( -DQT3_SUPPORT -Wno-undef -Wno-unused-parameter )
-
-IF (USE_WEBKIT_SVG_SUPPORT)
-add_definitions ( -DSVG_SUPPORT=1 )
-ENDIF (USE_WEBKIT_SVG_SUPPORT)
-
check_cxx_compiler_flag(-Wno-variadic-macros __KDE_HAVE_WVARIADIC_MACROS)
IF(__KDE_HAVE_WVARIADIC_MACROS)
kde4_automoc(platform/qt/ResourceLoaderManager.cpp)
# rules for generated files
-IF (USE_WEBKIT_SVG_SUPPORT)
+IF (WEBKIT_USE_SVG_SUPPORT)
set(IDL_BINDINGS_SVG
# ksvg2/svg/SVGNumber.idl
# ksvg2/svg/SVGPoint.idl
ksvg2/svg/SVGPathSegMovetoAbs.idl
ksvg2/svg/SVGPathSegMovetoRel.idl
)
-ENDIF (USE_WEBKIT_SVG_SUPPORT)
+ENDIF (WEBKIT_USE_SVG_SUPPORT)
set(IDL_BINDINGS
css/CSSValue.idl
foreach (idl ${IDL_BINDINGS})
get_filename_component(_basename ${idl} NAME_WE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.cpp ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.h
- COMMAND perl -I${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts ${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts/generate-bindings.pl --defines \"SVG_SUPPORT=${USE_WEBKIT_SVG_SUPPORT}\" --generator JS --include dom --include html --include xml --include ksvg2/svg --outputdir ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${idl}
+ COMMAND perl -I${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts ${CMAKE_CURRENT_SOURCE_DIR}/bindings/scripts/generate-bindings.pl --defines \"SVG_SUPPORT=${WEBKIT_USE_SVG_SUPPORT}\" --generator JS --include dom --include html --include xml --include ksvg2/svg --outputdir ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${idl}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${idl} )
set(WebCore-unity-IDLGeneratedSources ${WebCore-unity-IDLGeneratedSources} ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.cpp ${CMAKE_CURRENT_BINARY_DIR}/JS${_basename}.h )
endforeach (idl)
create_lut(WebCore-unity_LIB_SRCS bindings/js/JSXSLTProcessor.cpp JSXSLTProcessor.lut.h bindings/js/JSXSLTProcessor.cpp)
create_cpp_lut(bindings/js/JSHTMLInputElementBase.cpp JSHTMLInputElementBaseTable.cpp bindings/js/JSHTMLInputElementBase.cpp)
-IF (USE_WEBKIT_SVG_SUPPORT)
+IF (WEBKIT_USE_SVG_SUPPORT)
create_cpp_lut(ksvg2/bindings/js/JSSVGPoint.cpp JSSVGPointTable.cpp ksvg2/bindings/js/JSSVGPoint.cpp)
create_cpp_lut(ksvg2/bindings/js/JSSVGRect.cpp JSSVGRectTable.cpp ksvg2/bindings/js/JSSVGRect.cpp)
-ENDIF (USE_WEBKIT_SVG_SUPPORT)
+ENDIF (WEBKIT_USE_SVG_SUPPORT)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tokenizer.cpp
COMMAND flex -t < ${CMAKE_CURRENT_SOURCE_DIR}/css/tokenizer.flex | perl ${CMAKE_CURRENT_SOURCE_DIR}/css/maketokenizer > ${CMAKE_CURRENT_BINARY_DIR}/tokenizer.cpp
)
# source stuff
-IF (USE_WEBKIT_SVG_SUPPORT)
+IF (WEBKIT_USE_SVG_SUPPORT)
set (SVG_STUFF
${CMAKE_CURRENT_BINARY_DIR}/ksvg2/svg/SVGNames.cpp
${CMAKE_CURRENT_BINARY_DIR}/ksvg2/svg/SVGElementFactory.cpp
kcanvas/RenderSVGImage.cpp
kcanvas/RenderForeignObject.cpp
)
-ENDIF(USE_WEBKIT_SVG_SUPPORT)
-
+ENDIF(WEBKIT_USE_SVG_SUPPORT)
set(WebCore_SRCS
kde4_add_library(WebCore-unity SHARED ${WebCore_SRCS})
target_link_libraries(WebCore-unity
-
${QT_QT3SUPPORT_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTSVG_LIBRARY}
kjs-unity
pcre-unity
)
+
+install (TARGETS WebCore-unity DESTINATION ${LIB_INSTALL_DIR})
+2006-08-30 Nikolas Zimmermann <zimmermann@kde.org>
+
+ Reviewed by Tim H.
+
+ Commit KDE related tweaks, to be able to
+ differentiate between a Qt-only or a KDE build.
+
+ * CMakeLists.txt: Move global variables up to trunk/CMakeLists.txt.
+ Also rename USE_WEBKIT_SVG_SUPPORT to WEBKIT_USE_SVG_SUPPORT.
+
2006-08-30 Timothy Hatcher <timothy@apple.com>
Rubber-stamped by Brady.
+2006-08-30 Nikolas Zimmermann <zimmermann@kde.org>
+
+ Reviewed by Tim H.
+
+ Commit KDE related tweaks, to be able to
+ differentiate between a Qt-only or a KDE build.
+
+ * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Add ksvg2/ includes.
+ * QtLauncher/CMakeLists.txt: Add ksvg2/ includes.
+
2006-08-29 Darin Adler <darin@apple.com>
Reviewed by Tim Hatcher.
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/loader
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/qt
- BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/kwq
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/ksvg2
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/ksvg2/svg
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/ksvg2/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/rendering
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/editing
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/html
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/loader
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
- BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/kwq
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/svg
+ BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/rendering
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/editing
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/html