Commit fc4e8c23 authored by bdash's avatar bdash

2007-04-27 Holger Freyther <freyther@kde.org>

        Reviewed by Maciej.

        Remove unmaintained CMake build system.

        * CMakeLists.txt: Removed.

2007-04-27  Holger Freyther <freyther@kde.org>

        Reviewed by Maciej.

        Remove unmaintained CMake build system.

        * CMakeLists.txt: Removed.
        * pcre/CMakeLists.txt: Removed.

2007-04-27  Holger Freyther <freyther@kde.org>

        Reviewed by Maciej.

        Remove unmaintained CMake build system.

        * CMakeLists.txt: Removed.

2007-04-27  Holger Freyther <freyther@kde.org>

        Reviewed by Maciej.

        Remove unmaintained CMake build system.

        * QtLauncher/CMakeLists.txt: Removed.
        * WebKitPart/CMakeLists.txt: Removed.

2007-04-27  Holger Freyther <freyther@kde.org>

        Reviewed by Maciej.

        Remove unmaintained CMake build system.

        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Removed.
        * Scripts/build-webkit: Remove references to CMake.
        * Scripts/webkitdirs.pm: Remove references to CMake.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent adfea7c4
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)
# Global switch for XPath support
OPTION (WEBKIT_USE_XPATH_SUPPORT "Compile WebKit with XPath support." ON)
IF (WEBKIT_USE_XPATH_SUPPORT)
add_definitions (-DXPATH_SUPPORT=1)
ENDIF (WEBKIT_USE_XPATH_SUPPORT)
# Global switch for XSLT support
OPTION (WEBKIT_USE_XSLT_SUPPORT "Compile WebKit with XSLT support." ON)
IF (WEBKIT_USE_XSLT_SUPPORT)
add_definitions (-DXSLT_SUPPORT=1)
ENDIF (WEBKIT_USE_XSLT_SUPPORT)
# Global switch for XBL support
OPTION (WEBKIT_USE_XBL_SUPPORT "Compile WebKit with XBL support." OFF)
IF (WEBKIT_USE_XBL_SUPPORT)
add_definitions (-DXBL_SUPPORT=1)
ENDIF (WEBKIT_USE_XBL_SUPPORT)
# search packages used by KDE
IF (WEBKIT_USE_KDE_SUPPORT)
find_package (KDE4 REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
# use the KDE modules for finding these
find_package (LibXml2 REQUIRED)
find_package (LibXslt REQUIRED)
ELSE (WEBKIT_USE_KDE_SUPPORT)
INCLUDE(UsePkgConfig)
PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2CFlags)
SET(LIBXML2_LIBRARIES ${_LibXml2LinkFlags})
# I'd like to use the output of --cflags directly but cmake craps out on it ;(
SET(LIBXML2_INCLUDE_DIR ${_LibXml2IncDir}/libxml2)
PKGCONFIG(libxslt _LibXslt2IncDir _LibXslt2LinkDir _LibXslt2LinkFlags _LibXslt2CFlags)
SET(LIBXSLT_LIBRARIES ${_LibXslt2LinkFlags})
SET(LIBXSLT_INCLUDE_DIR ${_LibXslt2IncDir})
include(CheckLibraryExists)
include(FindQt4)
ENDIF (WEBKIT_USE_KDE_SUPPORT)
# Special option for BuildBot, to disable output colorization (must be done after KDE4Defaults is loaded)
OPTION (WEBKIT_DO_NOT_USE_COLORFUL_OUTPUT "Do not colorize compilation output." OFF)
IF (WEBKIT_DO_NOT_USE_COLORFUL_OUTPUT)
set(CMAKE_COLOR_MAKEFILE OFF)
ENDIF (WEBKIT_DO_NOT_USE_COLORFUL_OUTPUT)
find_package (JPEG REQUIRED)
find_package (PNG REQUIRED)
find_program (BISON_EXECUTABLE bison)
find_program (GPERF_EXECUTABLE gperf)
# quick check the libicu is available
find_path(LIBICU_INCLUDE_DIR unicode/umachine.h )
if (NOT BISON_EXECUTABLE)
message(FATAL_ERROR "Could not find bison")
endif (NOT BISON_EXECUTABLE)
if (NOT GPERF_EXECUTABLE)
message(FATAL_ERROR "Could not find gperf")
endif (NOT GPERF_EXECUTABLE)
if (NOT LIBICU_INCLUDE_DIR)
message(FATAL_ERROR "libicu not found, cannot create unity without it")
endif (NOT LIBICU_INCLUDE_DIR)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT -DHAVE_CONFIG_H=1)
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)
add_subdirectory (JavaScriptCore)
add_subdirectory (WebCore)
IF (WEBKIT_USE_KDE_SUPPORT)
add_subdirectory (WebKitTools/DumpRenderTree/DumpRenderTree.qtproj)
ENDIF (WEBKIT_USE_KDE_SUPPORT)
add_subdirectory (WebKitQt/QtLauncher)
IF (WEBKIT_USE_KDE_SUPPORT)
add_subdirectory (WebKitQt/WebKitPart)
ENDIF (WEBKIT_USE_KDE_SUPPORT)
include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* CMakeLists.txt: Removed.
2007-01-30 Simon Hausmann <hausmann@kde.org>
Reviewed by Zack.
......
project(kjs-unity)
MESSAGE(STATUS "Missing CMakeFiles.txt into wtf directory")
add_subdirectory( wtf )
add_subdirectory( pcre )
# Configuration checks
check_library_exists(pthread pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP)
check_library_exists(pthread pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/pcre
${CMAKE_CURRENT_SOURCE_DIR}/bindings
${CMAKE_CURRENT_SOURCE_DIR}/bindings/c
${CMAKE_CURRENT_BINARY_DIR}/kjs
${CMAKE_CURRENT_SOURCE_DIR}/kjs
${CMAKE_CURRENT_SOURCE_DIR}/wtf
${QT_INCLUDES}
)
if(WIN32)
include_directories( ${KDEWIN32_INCLUDES} )
endif(WIN32)
set(CREATE_HASH_TABLE ${CMAKE_CURRENT_SOURCE_DIR}/kjs/create_hash_table )
macro(CREATE_LUT _srcs_LIST _in_FILE _out_FILE _dep_FILE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_out_FILE}
COMMAND ${PERL_EXECUTABLE} ${CREATE_HASH_TABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_in_FILE} -i > ${CMAKE_CURRENT_BINARY_DIR}/${_out_FILE}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_in_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_dep_FILE} )
set( ${_srcs_LIST} ${${_srcs_LIST}} ${CMAKE_CURRENT_BINARY_DIR}/${_out_FILE})
endmacro(CREATE_LUT)
create_lut(kjs-unity_LIB_SRCS kjs/date_object.cpp kjs/date_object.lut.h kjs/date_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/number_object.cpp kjs/number_object.lut.h kjs/number_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/string_object.cpp kjs/string_object.lut.h kjs/string_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/array_object.cpp kjs/array_object.lut.h kjs/array_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/math_object.cpp kjs/math_object.lut.h kjs/math_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/regexp_object.cpp kjs/regexp_object.lut.h kjs/regexp_object.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/keywords.table kjs/lexer.lut.h kjs/lexer.cpp)
create_lut(kjs-unity_LIB_SRCS kjs/keywords.table kjs/lexer.lut.h kjs/lexer.cpp)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.cpp ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.h
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/kjs
COMMAND ${BISON_EXECUTABLE} -d -p kjsyy ${CMAKE_CURRENT_SOURCE_DIR}/kjs/grammar.y
COMMAND mv grammar.tab.c ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.cpp
COMMAND mv grammar.tab.h ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kjs/grammar.y
)
########### next target ###############
IF (WEBKIT_USE_KDE_SUPPORT)
kde4_add_library(wtf-unity SHARED
wtf/TCSystemAlloc.cpp
wtf/Assertions.cpp
wtf/HashTable.cpp
wtf/FastMalloc.cpp
)
ELSE (WEBKIT_USE_KDE_SUPPORT)
add_library(wtf-unity SHARED
wtf/TCSystemAlloc.cpp
wtf/Assertions.cpp
wtf/HashTable.cpp
wtf/FastMalloc.cpp
)
ENDIF (WEBKIT_USE_KDE_SUPPORT)
set(kjs-unity_LIB_SRCS
${kjs-unity_LIB_SRCS}
bindings/NP_jsobject.cpp
bindings/npruntime.cpp
bindings/runtime_array.cpp
bindings/runtime.cpp
bindings/runtime_method.cpp
bindings/runtime_object.cpp
bindings/runtime_root.cpp
bindings/c/c_class.cpp
bindings/c/c_instance.cpp
bindings/c/c_runtime.cpp
bindings/c/c_utility.cpp
kjs/DateMath.cpp
kjs/JSWrapperObject.cpp
kjs/PropertyNameArray.cpp
kjs/array_object.cpp
kjs/bool_object.cpp
kjs/collector.cpp
kjs/CommonIdentifiers.cpp
kjs/Context.cpp
kjs/date_object.cpp
kjs/debugger.cpp
kjs/dtoa.cpp
kjs/error_object.cpp
kjs/fpconst.cpp
kjs/function.cpp
kjs/function_object.cpp
${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.cpp
kjs/identifier.cpp
kjs/internal.cpp
kjs/interpreter.cpp
kjs/JSImmediate.cpp
kjs/JSLock.cpp
kjs/lexer.cpp
kjs/list.cpp
kjs/lookup.cpp
kjs/math_object.cpp
kjs/nodes.cpp
kjs/nodes2string.cpp
kjs/number_object.cpp
kjs/object.cpp
kjs/object_object.cpp
kjs/operations.cpp
kjs/Parser.cpp
kjs/property_map.cpp
kjs/property_slot.cpp
kjs/regexp.cpp
kjs/regexp_object.cpp
kjs/scope_chain.cpp
kjs/string_object.cpp
kjs/ustring.cpp
kjs/value.cpp
kjs/ExecState.cpp
)
IF (WEBKIT_USE_KDE_SUPPORT)
if(UNIX)
kde4_add_library(kjs-unity STATIC ${kjs-unity_LIB_SRCS})
target_link_libraries(kjs-unity ${KDE4_KDECORE_LIBS} m )
else(UNIX)
target_link_libraries(kjs-unity ${KDE4_KDECORE_LIBS})
endif(UNIX)
ELSE (WEBKIT_USE_KDE_SUPPORT)
add_library(kjs-unity STATIC ${kjs-unity_LIB_SRCS})
ENDIF (WEBKIT_USE_KDE_SUPPORT)
target_link_libraries(kjs-unity wtf-unity)
set_target_properties(kjs-unity PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
IF (WEBKIT_USE_KDE_SUPPORT)
install (TARGETS wtf-unity DESTINATION ${LIB_INSTALL_DIR})
install (TARGETS kjs-unity DESTINATION ${LIB_INSTALL_DIR})
ENDIF (WEBKIT_USE_KDE_SUPPORT)
# testkjs
IF (WEBKIT_USE_KDE_SUPPORT)
set(testkjs_SRCS kjs/testkjs.cpp)
kde4_add_executable(testkjs RUN_UNINSTALLED ${testkjs_SRCS})
target_link_libraries(testkjs ${KDE4_KDECORE_LIBS} kjs-unity pcre-unity icuuc)
ENDIF (WEBKIT_USE_KDE_SUPPORT)
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* CMakeLists.txt: Removed.
* pcre/CMakeLists.txt: Removed.
2007-04-27 Mark Rowe <mrowe@apple.com>
Reviewed by Oliver.
......
project( pcre-unity )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../wtf
)
#compile dftables.c -> dftables
#run dftables to generate chartables.c
add_executable(dftables dftables.c)
get_target_property(dftables_executable dftables LOCATION)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chartables.c
COMMAND ${dftables_executable} ${CMAKE_CURRENT_BINARY_DIR}/chartables.c
DEPENDS dftables )
set(pcre-unity_LIB_SRCS
${pcre-unity_LIB_SRCS}
${CMAKE_CURRENT_BINARY_DIR}/chartables.c
pcre_get.c
pcre_refcount.c
pcre_ucp_findchar.c
pcre_compile.c
pcre_globals.c
pcre_config.c
pcre_version.c
pcre_info.c
pcre_study.c
pcre_exec.c
pcre_xclass.c
pcre_tables.c
pcre_maketables.c
pcre_try_flipped.c
pcre_ord2utf8.c
pcre_fullinfo.c
)
IF (WEBKIT_USE_KDE_SUPPORT)
kde4_add_library(pcre-unity STATIC ${pcre-unity_LIB_SRCS})
ELSE (WEBKIT_USE_KDE_SUPPORT)
add_library(pcre-unity STATIC ${pcre-unity_LIB_SRCS})
ENDIF (WEBKIT_USE_KDE_SUPPORT)
This diff is collapsed.
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* CMakeLists.txt: Removed.
2007-04-26 Matt Perry <mpComplete@gmail.com>
Reviewed by Maciej.
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* QtLauncher/CMakeLists.txt: Removed.
* WebKitPart/CMakeLists.txt: Removed.
2007-04-25 Steve Falkenburg <sfalken@apple.com>
Reviewed by Adam.
......
include_directories(
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../..//JavaScriptCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/bridge
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/page
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/loader
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics/svg
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
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/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/dom
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/xml
)
add_definitions(-Wno-undef -Wno-unused-parameter)
set(testunity_SRCS main.cpp)
IF (WEBKIT_USE_KDE_SUPPORT)
kde4_add_executable(testunity RUN_UNINSTALLED ${testunity_SRCS})
target_link_libraries(testunity ${KDE4_KDECORE_LIBS} WebCore-unity)
kde4_automoc(testunity ${testunity_SRCS})
ELSE (WEBKIT_USE_KDE_SUPPORT)
include_directories(${QT_INCLUDES})
add_executable(testunity ${testunity_SRCS})
target_link_libraries(testunity WebCore-unity)
qt4_automoc(testunity ${testunity_SRCS})
ENDIF (WEBKIT_USE_KDE_SUPPORT)
include_directories (
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../JavaScriptCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/bridge
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/page
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/loader
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/graphics/svg
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/network
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/platform/qt
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/ksvg2/svg
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/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/dom
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../WebCore/xml
BEFORE ${CMAKE_SOURCE_DIR}/kdecore
)
add_definitions (-Wno-undef -Wno-unused-parameter)
set (WebKitPart_SRCS WebKitFactory.cpp WebKitPart.cpp WebKitPartBrowserExtension.cpp WebKitPartInterface.cpp WebKitPartClient.cpp)
qt4_add_dbus_adaptor (WebKitPart_SRCS org.kde.WebKitPart.xml WebKitPartInterface.h WebKitPartInterface)
kde4_automoc (WebKitPart ${WebKitPart_SRCS})
kde4_add_plugin (WebKitPart WITH_PREFIX ${WebKitPart_SRCS})
target_link_libraries (WebKitPart ${KDE4_KDECORE_LIBS} kparts WebCore-unity)
kde4_install_libtool_file (${PLUGIN_INSTALL_DIR}/ WebKitPart)
install (TARGETS WebKitPart DESTINATION ${PLUGIN_INSTALL_DIR})
install (FILES WebKitPart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install (FILES WebKitPart.rc WebKitPartBrowser.rc DESTINATION ${DATA_INSTALL_DIR}/WebKitPart)
2007-04-27 Holger Freyther <freyther@kde.org>
Reviewed by Maciej.
Remove unmaintained CMake build system.
* DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Removed.
* Scripts/build-webkit: Remove references to CMake.
* Scripts/webkitdirs.pm: Remove references to CMake.
2007-04-26 Alp Toker <alp@atoker.com>
Reviewed by Mark Rowe.
......
include_directories(
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../JavaScriptCore
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/bridge
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/page
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/loader
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/graphics
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/graphics/svg
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/network
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/platform/qt
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/css
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/dom
BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../../WebCore/xml
BEFORE ${CMAKE_SOURCE_DIR}/kdecore
)
add_definitions(-Wno-undef -Wno-unused-parameter)
set(DumpRenderTree_SRCS main.cpp DumpRenderTree.cpp DumpRenderTreeClient.cpp)
kde4_automoc(${DumpRenderTree_SRCS})
kde4_add_executable(DumpRenderTree RUN_UNINSTALLED ${DumpRenderTree_SRCS})
target_link_libraries(DumpRenderTree ${KDE4_KDECORE_LIBS} WebCore-unity)
......@@ -45,14 +45,11 @@ my $xpathSupport = 1;
my $xsltSupport = 1;
my $colorSupport = 1; # Default: colorize make output
our @cmakeBuild;
GetOptions('svg!' => \$svgSupport,
'svg-experimental!' => \$svgExperimentalSupport,
'xpath!' => \$xpathSupport,
'xslt!' => \$xsltSupport,
'color!' => \$colorSupport,
'cmake!' => \@cmakeBuild);
'color!' => \$colorSupport);
checkRequiredSystemConfig();
setConfiguration();
......
......@@ -352,8 +352,7 @@ sub isQt()
sub isQtWithQMake()
{
our @cmakeBuild;
return (isQt() and (@cmakeBuild eq 0))
return isQt();
}
sub isCygwin()
......@@ -440,38 +439,6 @@ sub buildVisualStudioProject($)
return $result;
}
sub buildCMakeProject($$)
{
my ($project, $colorize) = @_;
if ($project ne "WebKit") {
die "Qt/Linux builds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
}
my $config = configuration();
my $prefix = $ENV{"WebKitInstallationPrefix"};
my @buildArgs = ("-DCMAKE_BUILD_TYPE=$config");
push @buildArgs, "-DCMAKE_INSTALL_PREFIX=" . $prefix if(defined($prefix));
push @buildArgs, "-DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=" . ($colorize ? "OFF" : "ON");
push @buildArgs, "../../";
print "Calling 'cmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
print "Installation directory: $prefix\n" if(defined($prefix));
system "mkdir -p " . baseProductDir() . "/$config";
chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
my $result = system "cmake", @buildArgs;
if($result ne 0) {
die "Failed to setup build environment using cmake!\n";
}
$result = system "make";
chdir ".." or die;
return $result;
}
sub buildQMakeProject($$)
{
my ($project, $colorize) = @_;
......
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