Changeset 162427 in webkit

Timestamp:

Jan 20, 2014 10:25:49 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[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:

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/CMakeLists.txt (modified) (2 diffs)
• Source/Platform/CMakeLists.txt (deleted)
• Source/Platform/ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/cmake/FindEGL.cmake (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -41 +41 @@
 # 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})")
 

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/CMakeLists.txt

@@ -5 +5 @@
 
 add_subdirectory(JavaScriptCore)
-
-if ("${PORT}" STREQUAL "Nix")
-    add_subdirectory(Platform)
-endif ()
 
 if (ENABLE_API_TESTS)
@@ -31 +27 @@
 # 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)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -2879 +2879 @@
         "${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}
@@ -2887 +2886 @@
             ${OPENGL_gl_LIBRARY}
         )
-    elseif (OPENGLES2_FOUND AND NOT PORT STREQUAL "Nix")
+    elseif (OPENGLES2_FOUND)
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${OPENGLES2_INCLUDE_DIR}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/cmake/FindEGL.cmake

@@ -37 +37 @@
 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 ()

trunk/Source/cmake/OptionsCommon.cmake

@@ -1 @@
-# 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)