[geode-native] branch develop updated: Fix LGTM Xerces build

[bb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new ae32671  Fix LGTM Xerces build
ae32671 is described below

commit ae326718eb71c8b1e6f2d5f815034c5394fd15b6
Author: Alberto Gomez <al...@est.tech>
AuthorDate: Fri Jul 26 09:46:23 2019 +0200

    Fix LGTM Xerces build
    
    This reverts commit 0736fa444b25d4770b0ca421b63ed2d9de6c9b18.
---
 .lgtm.yml                            | 6 +++---
 dependencies/xerces-c/CMakeLists.txt | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.lgtm.yml b/.lgtm.yml
index c941789..5135970 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -4,9 +4,9 @@ extraction:
       command:
         - mkdir _lgtm_build_dir
         - cd _lgtm_build_dir
-        - wget -O apache-geode.zip http://mirror.transip.net/apache/geode/1.7.0/apache-geode-1.7.0.zip
-        - unzip apache-geode.zip
-        - cmake -DGEODE_ROOT="`pwd`/apache-geode-1.7.0" ..
+        - wget -O apache-geode.tgz http://mirror.transip.net/apache/geode/1.9.0/apache-geode-1.9.0.tgz
+        - tar xzf apache-geode.tgz
+        - cmake -DGEODE_ROOT="`pwd`/apache-geode-1.9.0" ..
         - cd dependencies && cmake --build . -- -j2
     index:
       build_command:
diff --git a/dependencies/xerces-c/CMakeLists.txt b/dependencies/xerces-c/CMakeLists.txt
index 3be40ed..b32832b 100644
--- a/dependencies/xerces-c/CMakeLists.txt
+++ b/dependencies/xerces-c/CMakeLists.txt
@@ -21,6 +21,10 @@ set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
 include(GNUInstallDirs)
 include(ExternalProject)
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(Xerces_TRANSCODER "-Dtranscoder=iconv")
+endif()
+
 ExternalProject_Add( ${PROJECT_NAME}-extern
   URL "http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${PROJECT_VERSION}.tar.gz"
   URL_HASH SHA256=${SHA256}
@@ -33,6 +37,8 @@ ExternalProject_Add( ${PROJECT_NAME}-extern
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DBUILD_SHARED_LIBS=OFF
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -Dnetwork:BOOL=OFF
+    ${Xerces_TRANSCODER}
 )
 
 ExternalProject_Get_Property( ${PROJECT_NAME}-extern INSTALL_DIR )