saberbud/parallel-hashmap
1
0
Fork 0
mirror of https://github.com/greg7mdp/parallel-hashmap.git synced 2026-08-30 00:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix travis

Browse Source
This commit is contained in:
greg
2019-03-27 20:37:51 -04:00
parent 829a3f30ab
commit f9403005dc
2 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
Vendored
+96
View File
@@ -10,7 +10,103 @@ matrix:
compiler: clang
env: COMPILER='clang++' CXXSTD='c++11'
- os: linux
compiler: gcc
env: COMPILER='g++' CXXSTD='c++11'
- os: linux
compiler: clang
env: COMPILER='clang++' CXXSTD='c++11'
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env: COMPILER='g++-5' CXXSTD='c++11'
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
env: COMPILER='g++-6' CXXSTD='c++11'
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: COMPILER='g++-7' CXXSTD='c++11'
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-8
env: COMPILER='g++-8' CXXSTD='c++14'
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-8
env: COMPILER='g++-8' CXXSTD='c++17'
- os: linux
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-trusty-3.9
packages:
- clang-3.9
env: COMPILER='clang++-3.9' CXXSTD='c++11'
- os: linux
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-trusty-4.0
packages:
- clang-4.0
env: COMPILER='clang++-4.0' CXXSTD='c++11'
- os: linux
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
packages:
- clang-5.0
env: COMPILER='clang++-5.0' CXXSTD='c++14'
- os: linux
compiler: clang
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
packages:
- clang-5.0
env: COMPILER='clang++-5.0' CXXSTD='c++17'
dist: trusty
sudo: false
CMakeLists.txt
Vendored
+8 -5
View File
@@ -41,12 +41,15 @@ export(EXPORT ${PROJECT_NAME}-targets
option(PHMAP_BUILD_TESTS "Whether or not to build the tests" OFF)
option(PHMAP_BUILD_EXAMPLES "Whether or not to build the examples" OFF)
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
elseif(CXXFLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXXFLAGS}")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
if (PHMAP_BUILD_TESTS)
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
include(cmake/DownloadGTest.cmake)
include_directories(${PROJECT_SOURCE_DIR})