webm2pes/ts: Fix gcc build.

Fix the build and tidy up a couple things along the way.

- Add -std=c++11 to CMakeLists.txt CXX flags.
- Add missing include to libwebm_utils.h (<memory>).
- Setup CMAKE_CXX_FLAGS properly (allow user override).
- Add missing URL for gtest repo to README.libwebm.

BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1136

Change-Id: I894729216737ff92f58a7b7601484ba8fba73b25
This commit is contained in:
Tom Finegan 2016-01-25 15:13:34 -05:00
parent 2e55d6c5f7
commit e569ab0f7c
3 changed files with 8 additions and 3 deletions

View File

@ -11,11 +11,14 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/build/msvc_runtime.cmake")
set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
# Enable C++11 support.
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
# Turn up the warning levels. # Turn up the warning levels.
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "/W4 ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "/W4 ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
else () else ()
set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
endif() endif()
# Test configuration flags. Defined here for visibility. # Test configuration flags. Defined here for visibility.

View File

@ -77,6 +77,7 @@ build directory:
$ LIBWEBM_TEST_DATA_PATH=path/to/libwebm/testing/testdata ./muxer_tests $ LIBWEBM_TEST_DATA_PATH=path/to/libwebm/testing/testdata ./muxer_tests
Note: Libwebm Googletest integration was built with googletest at git revision Note: Libwebm Googletest integration was built with googletest from
https://github.com/google/googletest.git at git revision
ddb8012eb48bc203aa93dcc2b22c1db516302b29. ddb8012eb48bc203aa93dcc2b22c1db516302b29.

View File

@ -9,6 +9,7 @@
#define LIBWEBM_COMMON_LIBWEBM_UTILS_H_ #define LIBWEBM_COMMON_LIBWEBM_UTILS_H_
#include <cstdio> #include <cstdio>
#include <memory>
#include <vector> #include <vector>
namespace libwebm { namespace libwebm {