Revert "[CMAKE] Remove Nix from CMake scripts"

This reverts commit 050410a.

Conflicts:
	Source/WebCore/ChangeLog

CMakeLists.txt

@@ -40,7 +40,7 @@ include(WebKitFeatures)
 # -----------------------------------------------------------------------------
 # Determine which port will be built
 # -----------------------------------------------------------------------------
-set(ALL_PORTS Efl WinCE GTK)
+set(ALL_PORTS Efl WinCE GTK Nix)
 set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 
 list(FIND ALL_PORTS ${PORT} RET)

ChangeLog

@@ -1,15 +1,3 @@
-2014-01-20  Ryuan Choi  <[email protected]>
-
-        [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  <[email protected]>
 
         Remove ENABLE_THREADED_HTML_PARSER defines everywhere

Source/CMakeLists.txt

@@ -5,6 +5,10 @@ add_subdirectory(WTF)
 
 add_subdirectory(JavaScriptCore)
 
+if ("${PORT}" STREQUAL "Nix")
+    add_subdirectory(Platform)
+endif ()
+
 if (ENABLE_API_TESTS)
     add_subdirectory(cmake/gtest)
 endif ()
@@ -26,6 +30,13 @@ 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 ()

Source/Platform/CMakeLists.txt

@@ -0,0 +1,5 @@
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+include_directories(${Platform_INCLUDES})
+add_library(Platform STATIC ${Platform_SOURCES})
+set_target_properties(Platform PROPERTIES FOLDER "Platform")

Source/Platform/ChangeLog

@@ -1,12 +1,3 @@
-2014-01-20  Ryuan Choi  <[email protected]>
-
-        [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  <[email protected]>
 
         Remove Nix from Source/Platform

Source/WebCore/CMakeLists.txt

@@ -2878,14 +2878,15 @@ if (WTF_USE_3D_GRAPHICS)
         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
         "${WEBCORE_DIR}/platform/graphics/gpu"
     )
-    if (OPENGL_FOUND)
+    # Nix may use either OpenGL or OpenGLES2 headers, so we handle this at PlatformNix.cmake.
+    if (OPENGL_FOUND AND NOT PORT STREQUAL "Nix")
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${OPENGL_INCLUDE_DIR}
         )
         list(APPEND WebCore_LIBRARIES
             ${OPENGL_gl_LIBRARY}
         )
-    elseif (OPENGLES2_FOUND)
+    elseif (OPENGLES2_FOUND AND NOT PORT STREQUAL "Nix")
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${OPENGLES2_INCLUDE_DIR}
         )

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 "GTK")
+if (PORT STREQUAL "Nix" OR PORT STREQUAL "GTK")
    mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
 endif ()

Source/cmake/OptionsCommon.cmake

@@ -1,5 +1,8 @@
-add_definitions(-DBUILDING_WITH_CMAKE=1)
-add_definitions(-DHAVE_CONFIG_H=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 ()
 
 if (WTF_OS_UNIX)
     add_definitions(-DXP_UNIX)