[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: https://svn.webkit.org/repository/webkit/trunk@162427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39756d4c54c8c76546dcd0e1806b1bd4b5cb7de0..75bb067f4c18a68b31a944df9e6c811e1b72f80b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

diff --git a/ChangeLog b/ChangeLog
index d3ed39c6ed701d8bccf361d7a982a97d758730c2..846ec99e7892f0d078a3c494a62db6570ce68c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 268ba2e248da679a8f3ef10b1e79f9159785e1ed..3736eea17a45ef4a1d752164fa925a2b87f8aaa4 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -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 ()

diff --git a/Source/Platform/CMakeLists.txt b/Source/Platform/CMakeLists.txt
deleted file mode 100644 (file)
index faf7cab..0000000
--- a/Source/Platform/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
-include_directories(${Platform_INCLUDES})
-add_library(Platform STATIC ${Platform_SOURCES})
-set_target_properties(Platform PROPERTIES FOLDER "Platform")

diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index 1a2160093def902c5dafd2fbddabd27058422cf6..5139864261711305ca1cf569cff3fcc11a1349f9 100644 (file)
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 8f91a569b41d432dc0669951cb360b05c98ada5e..76e165aab7acbf7fd21c65883d1ab6108b33aa0f 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -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}
         )

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 67c4787c2b04c849123b6b1b67db93bd7fc872de..2120f959d3f3b13614c8995987a33c4a32c8af74 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/Source/cmake/FindEGL.cmake b/Source/cmake/FindEGL.cmake
index eb907179953266b396515d8e051d70938921437d..9e76e4132841f32b262dc34d79043493b772a0c7 100644 (file)
--- a/Source/cmake/FindEGL.cmake
+++ b/Source/cmake/FindEGL.cmake
@@ -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 ()

diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 9fa44a24327a0c950e204f10bbd88431643b82f3..4a4c26f633f6b5bf44e5ca1c1eaafeaf6873a1c6 100644 (file)
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -1,8 +1,5 @@
-# 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)