From b55e21c03744dd41c9cf5313160685db837544ea Mon Sep 17 00:00:00 2001 From: Rob Parolin Date: Wed, 12 Jun 2019 14:03:28 -0700 Subject: [PATCH] osx ci fixes --- .travis.yml | 2 -- CMakeLists.txt | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e205882..d130684 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ os: - osx - windows -osx_image: xcode10.2 - compiler: - gcc - clang diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e459cb..9bf3131 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,12 @@ project(EAStdC CXX) #------------------------------------------------------------------------------------------- option(EASTDC_BUILD_TESTS "Enable generation of build files for tests" OFF) +#------------------------------------------------------------------------------------------- +# Compiler Flags +#------------------------------------------------------------------------------------------- +set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/test/packages/EASTL/scripts/CMake") +include(CommonCppFlags) + #------------------------------------------------------------------------------------------- # Library definition #-------------------------------------------------------------------------------------------