Try to find frameworks last on OSX

As suggested by [1], let's try not to use frameworks by default on OSX and use rvm rubies and things like that when available [1] https://gitlab.kitware.com/cmake/cmake/-/issues/16427
zy0999 · Nov 4, 2020 · 35a2562 · 35a2562
1 parent 1653f24
commit 35a2562
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,8 @@ jobs:
       dist: xenial
     - os: osx
 
-env:
-    global:
-        - PATH="/usr/bin:/usr/local/bin:$PATH"
-
 before_install:
+    - echo $PATH
     - 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 ruby-dev libmbedtls-dev; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -17,11 +17,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 # USA.
 
+set(_Ruby_DEBUG_OUTPUT ON)
+
 if("${CMAKE_SOURCE_DIR}" MATCHES "src/?$")
 	message(FATAL_ERROR "\nPlease execute cmake from the directory above, not the src/ directory.")
 	return()
 endif()
 
+# On OSX, frameworks are found before installed libraries (cf. https://gitlab.kitware.com/cmake/cmake/-/issues/16427)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+	set(CMAKE_FIND_FRAMEWORK Last)
+	message(STATUS "CMAKE_FIND_FRAMEWORK='${CMAKE_FIND_FRAMEWORK}'")
+endif()
+
 add_definitions (-DPROGNAME="${PROJECT_NAME}")
 add_definitions (-DAUTHOR="${AUTHOR}")
 add_definitions (-DVERSION="${VERSION}")