From 2d4761966aa93871b9d67b2ab01a0d48a8bffba6 Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Tue, 14 Oct 2014 15:11:50 +0800
Subject: [PATCH 1/2] fix jenkins linux compile error and add protobuf to
 ignore list

---
 .gitignore           | 1 +
 cocos/CMakeLists.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 172b3486d2..81e7834dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,4 @@ tests/cpp-tests/Resources/audio
 /external/ConvertUTF/
 /external/audio/
 /external/xxtea/
+/external/protobuf-lite/
diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt
index db03a0e78f..638a8219dd 100644
--- a/cocos/CMakeLists.txt
+++ b/cocos/CMakeLists.txt
@@ -53,7 +53,7 @@ include(editor-support/spine/CMakeLists.txt)
 include(../extensions/CMakeLists.txt)
 
 set(COCOS_EDITOR_SUPPORT_SRC
-  ${COCOS_CCB_SRC}  
+  ${COCOS_CCB_SRC}
   ${COCOS_CS_SRC}
   ${COCOS_SPINE_SRC}
 )
@@ -107,6 +107,7 @@ endif()
 
   #todo: provide prebuild versions of the xx libs for all platforms
   include_directories(
+    ../external/protobuf-lite/src
     ../external/xxhash
     ../external/xxtea)
 

From 5ea0f0c86aeb0a74186a303a6fb2a65cab7f7769 Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Tue, 14 Oct 2014 15:27:36 +0800
Subject: [PATCH 2/2] move include

---
 CMakeLists.txt       | 7 +++----
 cocos/CMakeLists.txt | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67469e9537..24910f8884 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,8 +152,8 @@ endif()
 
 
 # NB
-# we need to return these to libraries to their official state rather than 
-# having our custom cocos2d namespace so that we may use system versions if 
+# we need to return these to libraries to their official state rather than
+# having our custom cocos2d namespace so that we may use system versions if
 # the platform provides them. It is very important that this
 # is done before we make prebuilt versions of these two libs
 
@@ -188,8 +188,7 @@ if(NOT MINGW)
     ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}
     ${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER}
     ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER}
-
-
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf-lite/src
     ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}/freetype2
   )
 
diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt
index 638a8219dd..a2988999ae 100644
--- a/cocos/CMakeLists.txt
+++ b/cocos/CMakeLists.txt
@@ -107,7 +107,6 @@ endif()
 
   #todo: provide prebuild versions of the xx libs for all platforms
   include_directories(
-    ../external/protobuf-lite/src
     ../external/xxhash
     ../external/xxtea)