Lower cmake requirement for macOS builds

7 years ago · 9cf77842f8
2 changed files with 3 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -9,9 +9,6 @@ addons:
    - sdl2_mixer
    - sdl2_ttf
    - libsodium
-    
-install:
-  - brew upgrade cmake

 script:
  - mkdir build
--- 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)