3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Travis and CMake after moving CMakeLists.txt

Browse Source
This commit is contained in:
Phil Nash 2017-01-06 16:19:20 +00:00
parent 64193078bc
commit c8fefc4670
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ projects/XCode/iOSTest/Build
*.pyc *.pyc
DerivedData DerivedData
*.xccheckout *.xccheckout
Build

2
.travis.yml
View File

@ -155,7 +155,7 @@ install:
before_script: before_script:
- export CXX=${COMPILER} - export CXX=${COMPILER}
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- cmake -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
- cd Build - cd Build
script: script:

3
CMakeLists.txt
View File

@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 2.8)
project(Catch) project(Catch)
# define some folders # define some folders
get_filename_component(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH) set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(CATCH_DIR "${CATCH_DIR}" PATH)
set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest) set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
if(USE_CPP11) if(USE_CPP11)
## We can't turn this on by default, since it breaks on travis ## We can't turn this on by default, since it breaks on travis