ports/libyuv/nacl.patch - Issue 1555913002: Build gtest from source rather than using SDK-provided version

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ports/libyuv/nacl.patch

Issue 1555913002: Build gtest from source rather than using SDK-provided version (Closed) Base URL: https://chromium.googlesource.com/webports.git@master

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 diff --git a/CMakeLists.txt b/CMakeLists.txt	1 diff --git a/CMakeLists.txt b/CMakeLists.txt

2 --- a/CMakeLists.txt	2 --- a/CMakeLists.txt

3 +++ b/CMakeLists.txt	3 +++ b/CMakeLists.txt

4 @@ -100,19 +100,7 @@ if (JPEG_FOUND)	4 @@ -102,12 +102,13 @@ endif()

5 endif()

6

7 if(TEST)	5 if(TEST)

8 - find_library(GTEST_LIBRARY gtest)	6 find_library(GTEST_LIBRARY gtest)

9 - if(GTEST_LIBRARY STREQUAL "GTEST_LIBRARY-NOTFOUND")	7 if(GTEST_LIBRARY STREQUAL "GTEST_LIBRARY-NOTFOUND")

10 - set(GTEST_SRC_DIR /usr/src/gtest)	8 - set(GTEST_SRC_DIR /usr/src/gtest)

11 - if(EXISTS ${GTEST_SRC_DIR}/src/gtest-all.cc)	9 + set(GTEST_SRC_DIR /usr/src/gtest CACHE STRING "Location of gtest sources")

12 - message(STATUS "building gtest from sources in ${GTEST_SRC_DIR}")	10 if(EXISTS ${GTEST_SRC_DIR}/src/gtest-all.cc)

13 - set(gtest_sources ${GTEST_SRC_DIR}/src/gtest-all.cc)	11 message(STATUS "building gtest from sources in ${GTEST_SRC_DIR}")

14 - add_library(gtest STATIC ${gtest_sources})	12 set(gtest_sources ${GTEST_SRC_DIR}/src/gtest-all.cc)

15 - include_directories(${GTEST_SRC_DIR})	13 add_library(gtest STATIC ${gtest_sources})

16 - set(GTEST_LIBRARY gtest)	14 include_directories(${GTEST_SRC_DIR})

17 - else()	15 + include_directories(${GTEST_SRC_DIR}/include)
	binji 2016/01/04 19:12:54 why is this necessary? Perhaps when gtest is built why is this necessary? Perhaps when gtest is built from sources normally, the headers are placed somewhere else? Sam Clegg 2016/01/05 12:41:14 No, this is just how gtest is supposed to used. I Show quoted text On 2016/01/04 19:12:54, binji wrote: > why is this necessary? Perhaps when gtest is built from sources normally, the > headers are placed somewhere else? No, this is just how gtest is supposed to used. I don't think anyone else is using this CMakeLists.txt to build the tests so it went unnoticed. I will upstream this.
18 - message(FATAL_ERROR "TEST is set but unable to find gtest library")	16 set(GTEST_LIBRARY gtest)

19 - endif()	17 else()

20 - endif()	18 message(FATAL_ERROR "TEST is set but unable to find gtest library")

21 + set(GTEST_LIBRARY gtest)

22

23 add_executable(libyuv_unittest ${ly_unittest_sources})

24 target_link_libraries(libyuv_unittest ${ly_lib_name} ${GTEST_LIBRARY} pthread )

OLD	NEW

« ports/gtest/build.sh ('K') | « ports/libyuv/build.sh ('k') | ports/mingn/build.sh » ('j') | no next file with comments »