build_tools/XCompile-nacl.cmake - Issue 1057623004: Update upstream version of jsoncpp and run tests

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: build_tools/XCompile-nacl.cmake

Issue 1057623004: Update upstream version of jsoncpp and run tests (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 8 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

« no previous file with comments | « no previous file | ports/jsoncpp/build.sh » ('j') | ports/jsoncpp/nacl.patch » ('J')

OLD	NEW
1 # Cross-compiling requires CMake 2.6 or newer. To cross-compile, first modify	1 # Cross-compiling requires CMake 2.6 or newer. To cross-compile, first modify

2 # this file to set the proper settings and paths. Then use it from build/ like:	2 # this file to set the proper settings and paths. Then use it from build/ like:

3 # cmake .. -DCMAKE_TOOLCHAIN_FILE=../XCompile.txt \	3 # cmake .. -DCMAKE_TOOLCHAIN_FILE=../XCompile.txt \

4 # -DCMAKE_INSTALL_PREFIX=/usr/mingw32/mingw	4 # -DCMAKE_INSTALL_PREFIX=/usr/mingw32/mingw

5 # If you already have a toolchain file setup, you may use that instead of this	5 # If you already have a toolchain file setup, you may use that instead of this

6 # file.	6 # file.

7	7

8 SET(NACL 1)	8 SET(NACL 1)

9	9

10 # the name of the target operating system	10 # the name of the target operating system

(...skipping 19 matching lines...) Expand all Loading...
30 SET(DUMMY_VALUE ${CMAKE_TOOLCHAIN_FILE} ${CMAKE_PREFIX_PATH})	30 SET(DUMMY_VALUE ${CMAKE_TOOLCHAIN_FILE} ${CMAKE_PREFIX_PATH})

31	31

32 # adjust the default behaviour of the FIND_XXX() commands:	32 # adjust the default behaviour of the FIND_XXX() commands:

33 # search headers and libraries in the target environment, search	33 # search headers and libraries in the target environment, search

34 # programs in the host environment	34 # programs in the host environment

35 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)	35 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

36 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)	36 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

37 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)	37 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

38 SET(CMAKE_REQUIRED_INCLUDES "${NACL_SDK_ROOT}/include")	38 SET(CMAKE_REQUIRED_INCLUDES "${NACL_SDK_ROOT}/include")

39 LINK_DIRECTORIES(${NACL_SDK_LIBDIR})	39 LINK_DIRECTORIES(${NACL_SDK_LIBDIR})

40 INCLUDE_DIRECTORIES(${NACL_SDK_ROOT}/include)
binji 2015/04/02 07:39:07 maybe make this a separate change? It potentially maybe make this a separate change? It potentially affects much more than jsoncpp Sam Clegg 2015/04/02 17:58:48 Indeed this change does effect other packages, but Show quoted text On 2015/04/02 07:39:07, binji wrote: > maybe make this a separate change? It potentially affects much more than jsoncpp Indeed this change does effect other packages, but its also an essential part of this change. I'm happy with the trybot coverage in this case.
41 INCLUDE_DIRECTORIES(${EXTRA_INCLUDE})

42	40

43 # nacl abi says 32bits little endian	41 # nacl abi says 32bits little endian

44 SET(CMAKE_SIZEOF_VOID_P 4)	42 SET(CMAKE_SIZEOF_VOID_P 4)

OLD	NEW