Skip to content

Commit

Permalink
Merge pull request #73 from poacpm/develop
Browse files Browse the repository at this point in the history
Develop
Ken Matsui authored Jan 30, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 9bc876e + aaa66dd commit bc8e20f
Showing 2 changed files with 15 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -20,11 +20,7 @@ before_install:
- brew update
- brew upgrade boost; return 0
install:
- brew install llvm
- export CXX=/usr/local/opt/llvm/bin/clang++
- export LDFLAGS="-L/usr/local/opt/llvm/lib"
- export CPPFLAGS="-I/usr/local/opt/llvm/include"
- brew install yaml-cpp
- brew install llvm yaml-cpp
script:
- mkdir build
- cd build
16 changes: 14 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -22,8 +22,20 @@ endif()

include_directories( "/usr/local/include" )
link_directories( "/usr/local/lib" )
include_directories( "/usr/local/opt/openssl/include" )
link_directories( "/usr/local/opt/openssl/lib" )
if(${APPLE})
include_directories( "/usr/local/opt/openssl/include" )
link_directories( "/usr/local/opt/openssl/lib" )
execute_process(
COMMAND bash -c "sw_vers | head -n 2 | tail -n 1 | cut -f 2 | cut -f 2 -d \".\""
OUTPUT_VARIABLE OSX_VERSION
)
if(NOT ${OSX_VERSION} EQUAL 14)
message(STATUS "Set to homebrew's llvm")
set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/opt/llvm/include")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/opt/llvm/lib")
endif()
endif()

add_executable(${PROJECT_NAME} main.cpp)
target_link_libraries(${PROJECT_NAME}

0 comments on commit bc8e20f

Please sign in to comment.