From a4d1ece5113f2dca93011ee314abe7f4c942484f Mon Sep 17 00:00:00 2001 From: apathy Date: Wed, 27 Jul 2016 10:47:48 -0700 Subject: [PATCH 1/4] Only attempt to use libc++ on darwin based environment (osx) --- cmake/ModernCpp.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/ModernCpp.cmake b/cmake/ModernCpp.cmake index cd1da3b..b3499ef 100644 --- a/cmake/ModernCpp.cmake +++ b/cmake/ModernCpp.cmake @@ -1,8 +1,9 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++") - if (NOT APPLE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + if (APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") endif () elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") From 833a01517b94b2444826ae1f47316b16f007db4b Mon Sep 17 00:00:00 2001 From: apathy Date: Wed, 27 Jul 2016 10:48:12 -0700 Subject: [PATCH 2/4] Set no-write-strings for clang and gcc --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4241cf..5d6e370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(Boost_USE_MULTITHREADED ON) find_package(Boost COMPONENTS program_options REQUIRED) find_package(SQLite3 REQUIRED) -if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") +if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings") endif () From 050b2c1499604ea132529edde29f48ace686a91a Mon Sep 17 00:00:00 2001 From: apathy Date: Wed, 27 Jul 2016 10:48:18 -0700 Subject: [PATCH 3/4] Add missing include --- src/stationapi/Node.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stationapi/Node.hpp b/src/stationapi/Node.hpp index 7353495..6ce98a3 100644 --- a/src/stationapi/Node.hpp +++ b/src/stationapi/Node.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include template From 7b2c3a85c744129bf4e976b8919049269da4577d Mon Sep 17 00:00:00 2001 From: Eric Barr Date: Sun, 2 Oct 2016 15:13:45 -0700 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c69a1e..9e1c073 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# stationapi [![Build Status](https://travis-ci.com/apathyboy/stationapi.svg?token=FbjsTwsn9ctKssvZJqCa&branch=master)](https://travis-ci.com/apathyboy/stationapi) # +# stationapi [![Build Status](https://travis-ci.org/apathyboy/stationapi.svg?branch=master)](https://travis-ci.com/apathyboy/stationapi) # A base library at the core of applications that implement chat and login functionality across galaxies.