From 9cf77842f84d0da0da4eac797a72cd6838dfcd66 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 9 Mar 2019 12:44:12 +0100
Subject: [PATCH] Lower cmake requirement for macOS builds

---
 .travis.yml    | 3 ---
 CMakeLists.txt | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d688fafab..421153516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ addons:
     - sdl2_mixer
     - sdl2_ttf
     - libsodium
-    
-install:
-  - brew upgrade cmake
 
 script:
   - mkdir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efbfa9dde..caf541c47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,8 +236,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # Silence warnings about __int64 alignment hack not always being applicable
   target_compile_options(devilutionx PRIVATE -Wno-ignored-attributes)
   # Fix: error: cast from pointer to smaller type 'unsigned char' loses information
-  target_compile_options(devilution PRIVATE -fms-extensions -fms-compatibility -fms-compatibility-version=19.00)
-  target_link_options(devilutionx PRIVATE -liconv)
+  target_compile_options(devilution PRIVATE -fms-extensions -fms-compatibility -fms-compatibility-version=19.00)
+
+  set_target_properties(devilutionx PROPERTIES LINK_FLAGS "-liconv")
 endif()
 
 if(COTIRE)