Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified 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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ports/jsoncpp/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/XCompile-nacl.cmake
diff --git a/build_tools/XCompile-nacl.cmake b/build_tools/XCompile-nacl.cmake
index 9cf1ac596917193dcaca0ae724d6b96ad7e4ea99..98dfa4b616d2499f12cf0da647fc21cc3910d4ff 100644
--- a/build_tools/XCompile-nacl.cmake
+++ b/build_tools/XCompile-nacl.cmake
@@ -37,8 +37,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
SET(CMAKE_REQUIRED_INCLUDES "${NACL_SDK_ROOT}/include")
LINK_DIRECTORIES(${NACL_SDK_LIBDIR})
-INCLUDE_DIRECTORIES(${NACL_SDK_ROOT}/include)
-INCLUDE_DIRECTORIES(${EXTRA_INCLUDE})
# nacl abi says 32bits little endian
SET(CMAKE_SIZEOF_VOID_P 4)
« no previous file with comments | « no previous file | ports/jsoncpp/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698