Merge pull request Aorimn#2 from Aorimn/master

Update upstream modifications
zy0999 · Nov 3, 2020 · 9a02545 · 9a02545
2 parents 77280e7 + c6e5a26
commit 9a02545
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,17 +4,21 @@ compiler:
     - clang
     - gcc
 
-os:
-    - linux
-    - osx
+jobs:
+  include:
+    - os: linux
+      disk: bionic
+    - os: linux
+      dist: xenial
+    - os: osx
 
 env:
     global:
         - PATH="/usr/bin:/usr/local/bin:$PATH"
 
 before_install:
     - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -qq libfuse-dev libpolarssl-dev ruby-dev; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -qq libfuse-dev ruby-dev libmbedtls-dev; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install -v Caskroom/cask/osxfuse; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./src/mbed_install.sh; fi

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -122,9 +122,9 @@ else()
 endif()
 
 find_package (Ruby)
-if(RUBY_FOUND  AND  RUBY_INCLUDE_DIRS  AND  RUBY_LIBRARIES)
+if(RUBY_FOUND  AND  RUBY_INCLUDE_DIRS  AND  RUBY_LIBRARY)
 	include_directories (${RUBY_INCLUDE_DIRS})
-	set (LIB "${LIB} ${RUBY_LIBRARIES}")
+	set (LIB "${LIB} ${RUBY_LIBRARY}")
 	add_definitions (-D_HAVE_RUBY=${RUBY_VERSION_STRING})
 	set (SOURCES ${SOURCES} ruby.c)
 endif()