[CMAKE] Remove Nix from CMake scripts

https://bugs.webkit.org/show_bug.cgi?id=127264

Reviewed by Anders Carlsson.

.:

* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/cmake/FindEGL.cmake:
* Source/cmake/OptionsCommon.cmake:

Source/Platform:

* CMakeLists.txt: Removed.

Source/WebCore:

* CMakeLists.txt:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bb116788
......@@ -40,7 +40,7 @@ include(WebKitFeatures)
# -----------------------------------------------------------------------------
# Determine which port will be built
# -----------------------------------------------------------------------------
set(ALL_PORTS Efl WinCE GTK Nix)
set(ALL_PORTS Efl WinCE GTK)
set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
list(FIND ALL_PORTS ${PORT} RET)
......
2014-01-20 Ryuan Choi <ryuan.choi@samsung.com>
[CMAKE] Remove Nix from CMake scripts
https://bugs.webkit.org/show_bug.cgi?id=127264
Reviewed by Anders Carlsson.
* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/cmake/FindEGL.cmake:
* Source/cmake/OptionsCommon.cmake:
2014-01-18 Anders Carlsson <andersca@apple.com>
Remove ENABLE_THREADED_HTML_PARSER defines everywhere
......
......@@ -5,10 +5,6 @@ add_subdirectory(WTF)
add_subdirectory(JavaScriptCore)
if ("${PORT}" STREQUAL "Nix")
add_subdirectory(Platform)
endif ()
if (ENABLE_API_TESTS)
add_subdirectory(cmake/gtest)
endif ()
......@@ -30,13 +26,6 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
# -----------------------------------------------------------------------------
# Set compiler flags for all targets
# -----------------------------------------------------------------------------
if ("${PORT}" STREQUAL "Nix")
if (NOT DISABLE_STRICT_BUILD)
set(ADDITIONAL_FLAGS ENABLE_WERROR)
endif ()
WEBKIT_SET_EXTRA_COMPILER_FLAGS(Platform ${ADDITIONAL_FLAGS})
endif ()
if (${PORT} STREQUAL "Efl")
set(ADDITIONAL_FLAGS ENABLE_WERROR)
endif ()
......
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
include_directories(${Platform_INCLUDES})
add_library(Platform STATIC ${Platform_SOURCES})
set_target_properties(Platform PROPERTIES FOLDER "Platform")
2014-01-20 Ryuan Choi <ryuan.choi@samsung.com>
[CMAKE] Remove Nix from CMake scripts
https://bugs.webkit.org/show_bug.cgi?id=127264
Reviewed by Anders Carlsson.
* CMakeLists.txt: Removed.
2014-01-16 Benjamin Poulain <bpoulain@apple.com>
Remove Nix from Source/Platform
......
......@@ -2878,15 +2878,14 @@ if (WTF_USE_3D_GRAPHICS)
"${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
"${WEBCORE_DIR}/platform/graphics/gpu"
)
# Nix may use either OpenGL or OpenGLES2 headers, so we handle this at PlatformNix.cmake.
if (OPENGL_FOUND AND NOT PORT STREQUAL "Nix")
if (OPENGL_FOUND)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${OPENGL_INCLUDE_DIR}
)
list(APPEND WebCore_LIBRARIES
${OPENGL_gl_LIBRARY}
)
elseif (OPENGLES2_FOUND AND NOT PORT STREQUAL "Nix")
elseif (OPENGLES2_FOUND)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${OPENGLES2_INCLUDE_DIR}
)
......
2014-01-20 Ryuan Choi <ryuan.choi@samsung.com>
[CMAKE] Remove Nix from CMake scripts
https://bugs.webkit.org/show_bug.cgi?id=127264
Reviewed by Anders Carlsson.
* CMakeLists.txt:
2014-01-20 Anders Carlsson <andersca@apple.com>
Remove an unused PageGroup function
......@@ -36,6 +36,6 @@ find_library(EGL_LIBRARY NAMES ${EGL_NAMES})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
if (PORT STREQUAL "Nix" OR PORT STREQUAL "GTK")
if (PORT STREQUAL "GTK")
mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
endif ()
# Nix doesn't use cmakeconfig.h
if (NOT PORT STREQUAL "Nix")
add_definitions(-DBUILDING_WITH_CMAKE=1)
add_definitions(-DHAVE_CONFIG_H=1)
endif ()
add_definitions(-DBUILDING_WITH_CMAKE=1)
add_definitions(-DHAVE_CONFIG_H=1)
if (WTF_OS_UNIX)
add_definitions(-DXP_UNIX)
......
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