Changeset 228051 in webkit


Ignore:
Timestamp:
Feb 4, 2018 12:17:17 AM (6 years ago)
Author:
zandobersek@gmail.com
Message:

Lots of build warnings from Source/ThirdParty/openvr
​https://bugs.webkit.org/show_bug.cgi?id=182117

Reviewed by Michael Catanzaro.

Suppress OpenVR compiler warnings by listing -Wno-unknown-pragmas,
-Wno-unused-parameter and -Wno-unused-variable options among the
libopenvr_api.so CXX flags.

CMake configuration warning about default project variables for the
openvr_api project is avoided by removing the openvr_api project and
instead setting the OPENVR_SOURCE_DIR to the path of the OpenVR
source directory under Source/ThirdParty/.

Another compiler warning is removed by fixing the return condition in
the Path_WriteBinaryFile() function to perform an equality comparison
instead of an assignment. This has already been fixed upstream.

All changes to the OpenVR code are reflected in the separately-managed
patch files kept in the patches/ directory.

  • openvr/README.webkit:
  • openvr/patches/Path_WriteBinaryFile-fix-return-condition.patch: Added.
  • openvr/patches/cmake-build.patch:
  • openvr/src/CMakeLists.txt:
  • openvr/src/vrcommon/pathtools_public.cpp:

(Path_WriteBinaryFile):

Location:
trunk/Source/ThirdParty
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ChangeLog

    r227845 r228051  
     12018-02-04  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Lots of build warnings from Source/ThirdParty/openvr
     4        https://bugs.webkit.org/show_bug.cgi?id=182117
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Suppress OpenVR compiler warnings by listing -Wno-unknown-pragmas,
     9        -Wno-unused-parameter and -Wno-unused-variable options among the
     10        libopenvr_api.so CXX flags.
     11
     12        CMake configuration warning about default project variables for the
     13        openvr_api project is avoided by removing the openvr_api project and
     14        instead setting the OPENVR_SOURCE_DIR to the path of the OpenVR
     15        source directory under Source/ThirdParty/.
     16
     17        Another compiler warning is removed by fixing the return condition in
     18        the Path_WriteBinaryFile() function to perform an equality comparison
     19        instead of an assignment. This has already been fixed upstream.
     20
     21        All changes to the OpenVR code are reflected in the separately-managed
     22        patch files kept in the patches/ directory.
     23
     24        * openvr/README.webkit:
     25        * openvr/patches/Path_WriteBinaryFile-fix-return-condition.patch: Added.
     26        * openvr/patches/cmake-build.patch:
     27        * openvr/src/CMakeLists.txt:
     28        * openvr/src/vrcommon/pathtools_public.cpp:
     29        (Path_WriteBinaryFile):
     30
    1312018-01-30  Don Olmstead  <don.olmstead@sony.com>
    232

  • trunk/Source/ThirdParty/openvr/README.webkit

    r227518 r228051  
    1515* patches/cmake-build.patch: script used to allow openvr CMake build to be
    1616integrated into WebKit build
     17* patches/Path_WriteBinaryFile-fix-return-condition.patch: suppresses a
     18compiler warning, but otherwise already applied upstream in 1.0.12
    1719* Removed bin/ directory. Not needed as it includes precompiled libraries
    1820* Removed lib/ directory. Not needed as it includes precompiled libraries

  • trunk/Source/ThirdParty/openvr/patches/cmake-build.patch

    r227518 r228051  
    11diff --git a/CMakeLists.txt b/CMakeLists.txt
    2 index 94de3ce..6decedd 100644
     2index d7025c0db4b..d13a7f90cf8 100644
    33--- a/CMakeLists.txt
    44+++ b/CMakeLists.txt
    … …  
    4141        # Enable c++11 and hide symbols which shouldn't be visible
    4242diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
    43 index 58954d6..8b537af 100644
     43index e58c9e1c039..095f81e562b 100644
    4444--- a/src/CMakeLists.txt
    4545+++ b/src/CMakeLists.txt
    46 @@ -3,6 +3,9 @@ project(openvr_api)
     46@@ -1,8 +1,10 @@
     47-# Project name.
     48-project(openvr_api)
     49+set(OPENVR_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/openvr)
    4750 
    4851 set( LIBNAME "openvr_api" )
    … …  
    5457 if(APPLE)
    5558   set(CMAKE_MACOSX_RPATH 1)
    56 @@ -22,7 +25,7 @@ elseif(WIN32)
     59@@ -22,7 +24,7 @@ elseif(WIN32)
    5760 endif()
    5861 
    5962 # Add include folders.
    6063-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/headers ${CMAKE_SOURCE_DIR}/src/vrcommon)
    61 +include_directories(${PROJECT_SOURCE_DIR}/../src ${PROJECT_SOURCE_DIR}/../headers ${PROJECT_SOURCE_DIR}/../src/vrcommon)
     64+include_directories(${OPENVR_SOURCE_DIR}/src ${OPENVR_SOURCE_DIR}/headers ${OPENVR_SOURCE_DIR}/src/vrcommon)
    6265 
    6366 if(USE_CUSTOM_LIBCXX)
    6467        link_directories(
    65 @@ -65,22 +68,22 @@ elseif(BUILD_FRAMEWORK)
     68@@ -65,28 +67,34 @@ elseif(BUILD_FRAMEWORK)
    6669        set( LIBNAME "OpenVR" )
    6770        add_library( ${LIBNAME}
    … …  
    7275-            ${CMAKE_SOURCE_DIR}/headers/openvr_capi.h
    7376-            ${CMAKE_SOURCE_DIR}/headers/openvr_driver.h
    74 +            ${PROJECT_SOURCE_DIR}/../headers/openvr.h
    75 +            ${PROJECT_SOURCE_DIR}/../headers/openvr_api.cs
    76 +            ${PROJECT_SOURCE_DIR}/../headers/openvr_api.json
    77 +            ${PROJECT_SOURCE_DIR}/../headers/openvr_capi.h
    78 +            ${PROJECT_SOURCE_DIR}/../headers/openvr_driver.h
     77+            ${OPENVR_SOURCE_DIR}/headers/openvr.h
     78+            ${OPENVR_SOURCE_DIR}/headers/openvr_api.cs
     79+            ${OPENVR_SOURCE_DIR}/headers/openvr_api.json
     80+            ${OPENVR_SOURCE_DIR}/headers/openvr_capi.h
     81+            ${OPENVR_SOURCE_DIR}/headers/openvr_driver.h
    7982        )
    8083        set_target_properties(OpenVR PROPERTIES
    … …  
    8386               MACOSX_FRAMEWORK_IDENTIFIER com.valvesoftware.OpenVR.framework
    8487-              MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_SOURCE_DIR}/src/Info.plist
    85 +              MACOSX_FRAMEWORK_INFO_PLIST ${PROJECT_SOURCE_DIR}/../src/Info.plist
     88+              MACOSX_FRAMEWORK_INFO_PLIST ${OPENVR_SOURCE_DIR}/src/Info.plist
    8689               # "current version" in semantic format in Mach-O binary file
    8790               VERSION 1.0.6
    … …  
    8992               SOVERSION 1.0.0
    9093-              PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/headers/openvr.h;${CMAKE_SOURCE_DIR}/headers/openvr_api.cs;${CMAKE_SOURCE_DIR}/headers/openvr_api.json;${CMAKE_SOURCE_DIR}/headers/openvr_capi.h;${CMAKE_SOURCE_DIR}/headers/openvr_driver.h"
    91 +              PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/../headers/openvr.h;${PROJECT_SOURCE_DIR}/../headers/openvr_api.cs;${PROJECT_SOURCE_DIR}/../headers/openvr_api.json;${PROJECT_SOURCE_DIR}/../headers/openvr_capi.h;${PROJECT_SOURCE_DIR}/../headers/openvr_driver.h"
     94+              PUBLIC_HEADER "${OPENVR_SOURCE_DIR}/headers/openvr.h;${OPENVR_SOURCE_DIR}/headers/openvr_api.cs;${OPENVR_SOURCE_DIR}/headers/openvr_api.json;${OPENVR_SOURCE_DIR}/headers/openvr_capi.h;${OPENVR_SOURCE_DIR}/headers/openvr_driver.h"
    9295               LINKER_LANGUAGE CXX
    9396        )
    9497 else()
     98        add_library(${LIBNAME} STATIC ${SOURCE_FILES})
     99 endif()
     100 
     101+if (COMPILER_IS_GCC_OR_CLANG)
     102+    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-unknown-pragmas
     103+                                           -Wno-unused-parameter
     104+                                           -Wno-unused-variable)
     105+endif()
     106+
     107 if(USE_CUSTOM_LIBCXX)
     108        set(EXTRA_LIBS ${EXTRA_LIBS} c++ c++abi)
     109 endif()

  • trunk/Source/ThirdParty/openvr/src/CMakeLists.txt

    r227518 r228051  
    1 # Project name.
    2 project(openvr_api)
     1set(OPENVR_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/openvr)
    32
    43set( LIBNAME "openvr_api" )
    … …  
    2625
    2726# Add include folders.
    28 include_directories(${PROJECT_SOURCE_DIR}/../src ${PROJECT_SOURCE_DIR}/../headers ${PROJECT_SOURCE_DIR}/../src/vrcommon)
     27include_directories(${OPENVR_SOURCE_DIR}/src ${OPENVR_SOURCE_DIR}/headers ${OPENVR_SOURCE_DIR}/src/vrcommon)
    2928
    3029if(USE_CUSTOM_LIBCXX)
    … …  
    6968       add_library( ${LIBNAME}
    7069            SHARED ${SOURCE_FILES}
    71             ${PROJECT_SOURCE_DIR}/../headers/openvr.h
    72             ${PROJECT_SOURCE_DIR}/../headers/openvr_api.cs
    73             ${PROJECT_SOURCE_DIR}/../headers/openvr_api.json
    74             ${PROJECT_SOURCE_DIR}/../headers/openvr_capi.h
    75             ${PROJECT_SOURCE_DIR}/../headers/openvr_driver.h
     70            ${OPENVR_SOURCE_DIR}/headers/openvr.h
     71            ${OPENVR_SOURCE_DIR}/headers/openvr_api.cs
     72            ${OPENVR_SOURCE_DIR}/headers/openvr_api.json
     73            ${OPENVR_SOURCE_DIR}/headers/openvr_capi.h
     74            ${OPENVR_SOURCE_DIR}/headers/openvr_driver.h
    7675       )
    7776       set_target_properties(OpenVR PROPERTIES
    … …  
    7978              FRAMEWORK_VERSION A
    8079              MACOSX_FRAMEWORK_IDENTIFIER com.valvesoftware.OpenVR.framework
    81               MACOSX_FRAMEWORK_INFO_PLIST ${PROJECT_SOURCE_DIR}/../src/Info.plist
     80              MACOSX_FRAMEWORK_INFO_PLIST ${OPENVR_SOURCE_DIR}/src/Info.plist
    8281              # "current version" in semantic format in Mach-O binary file
    8382              VERSION 1.0.6
    8483              # "compatibility version" in semantic format in Mach-O binary file
    8584              SOVERSION 1.0.0
    86               PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/../headers/openvr.h;${PROJECT_SOURCE_DIR}/../headers/openvr_api.cs;${PROJECT_SOURCE_DIR}/../headers/openvr_api.json;${PROJECT_SOURCE_DIR}/../headers/openvr_capi.h;${PROJECT_SOURCE_DIR}/../headers/openvr_driver.h"
     85              PUBLIC_HEADER "${OPENVR_SOURCE_DIR}/headers/openvr.h;${OPENVR_SOURCE_DIR}/headers/openvr_api.cs;${OPENVR_SOURCE_DIR}/headers/openvr_api.json;${OPENVR_SOURCE_DIR}/headers/openvr_capi.h;${OPENVR_SOURCE_DIR}/headers/openvr_driver.h"
    8786              LINKER_LANGUAGE CXX
    8887       )
    8988else()
    9089       add_library(${LIBNAME} STATIC ${SOURCE_FILES})
     90endif()
     91
     92if (COMPILER_IS_GCC_OR_CLANG)
     93    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-unknown-pragmas
     94                                           -Wno-unused-parameter
     95                                           -Wno-unused-variable)
    9196endif()
    9297

  • trunk/Source/ThirdParty/openvr/src/vrcommon/pathtools_public.cpp

    r227518 r228051  
    656656       }
    657657
    658        return written = nSize ? true : false;
     658       return written == nSize ? true : false;
    659659}
    660660
Note: See TracChangeset for help on using the changeset viewer.