diff --git a/.travis.yml b/.travis.yml index 48724c1..9ce4516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,13 +22,10 @@ before_install: - cd googletest-release-1.8.0/googletest - cmake -DBUILD_SHARED_LIBS=ON . - make - # target cmake requires ".a" OSX binaries, symlink them + # target cmake requires ".a" OSX binaries - mkdir build - - ls -la - - ln -s libgtest_main.so build/libgtest_main.a - - ln -s libgtest.so build/libgtest.a - - sudo cp -a include/gtest /usr/include - - sudo cp -a libgtest_main.so libgtest.so /usr/lib/ + - cp libgtest_main.so build/libgtest_main.a + - cp libgtest.so build/libgtest.a script: - cd $TRAVIS_BUILD_DIR diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index af416aa..61f2e2c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12) SET(CMAKE_CXX_STANDARD 11) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing -Wno-int-to-pointer-cast") set(CMAKE_VERBOSE_MAKEFILE on) project(Unittest)