Selaa lähdekoodia

Merge pull request #290 from kainjow/osx-timer

Fix OS X link error due to missing libcompat
bel2125 9 vuotta sitten
vanhempi
commit
082b6a1fc4
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      .travis.yml
  2. 1 1
      test/CMakeLists.txt

+ 1 - 1
.travis.yml

@@ -8,7 +8,7 @@ compiler:
 
 os:
   - linux
-#  - osx
+  - osx
 
 env:
   global:

+ 1 - 1
test/CMakeLists.txt

@@ -33,7 +33,7 @@ set(CHECK_INSTALL_DIR ${INSTALL_DIR})
 unset(INSTALL_DIR)
 link_directories("${CHECK_INSTALL_DIR}/lib")
 include_directories("${CHECK_INSTALL_DIR}/include")
-if (WIN32 AND MINGW)
+if ((WIN32 AND MINGW) OR APPLE)
   set(CHECK_LIBRARIES "${CHECK_LIBRARIES};${CHECK_INSTALL_DIR}/lib/libcheck.a")
   set(CHECK_LIBRARIES "${CHECK_LIBRARIES};${CHECK_INSTALL_DIR}/lib/libcompat.a")
 elseif (WIN32)