Update from upstream to get ARM support fixes

libheartbeats · Oct 8, 2015 · 3ca261b · 3ca261b
1 parent cc770dc
commit 3ca261b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/heartbeats-simple/.travis.yml b/heartbeats-simple/.travis.yml
@@ -1,5 +1,12 @@
+sudo: required
+
 language: c
 
+install:
+  - sudo add-apt-repository ppa:kubuntu-ppa/backports -y
+  - sudo apt-get update
+  - sudo apt-get install --only-upgrade cmake
+
 script:
   - mkdir _build
   - cd _build

diff --git a/heartbeats-simple/CMakeLists.txt b/heartbeats-simple/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
 
 project(heartbeats-simple)
 set(PROJECT_VERSION 0.1.0)
@@ -18,6 +18,8 @@ set(HBS_POW_SRC src/hb.c src/hb-util.c src/hb-pow-util.c)
 set(HBS_POW_PROP HEARTBEAT_MODE_POW;HEARTBEAT_USE_POW)
 set(HBS_ACC_POW_SRC src/hb.c src/hb-util.c src/hb-acc-util.c src/hb-pow-util.c)
 set(HBS_ACC_POW_PROP HEARTBEAT_MODE_ACC_POW;HEARTBEAT_USE_ACC;HEARTBEAT_USE_POW)
+# force fPIC on static libs
+set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
 add_library(hbs SHARED ${HBS_SRC})
 add_library(hbs-static STATIC ${HBS_SRC})
@@ -37,12 +39,6 @@ set_target_properties(hbs-acc-pow PROPERTIES COMPILE_DEFINITIONS "${HBS_ACC_POW_
 add_library(hbs-acc-pow-static STATIC ${HBS_ACC_POW_SRC})
 set_target_properties(hbs-acc-pow-static PROPERTIES COMPILE_DEFINITIONS "${HBS_ACC_POW_PROP}")
 
-# Required to force fPIC on static libs
-# 'set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)' not supported until cmake 2.8.9
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  SET_TARGET_PROPERTIES(hbs-static hbs-acc-static hbs-pow-static hbs-acc-pow-static PROPERTIES COMPILE_FLAGS "-fPIC")
-ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-
 # Examples
 
 add_executable(hb-pow-example example/hb-pow-example.c)