Fixed Travis and CMake after moving CMakeLists.txt

2017-01-06 16:19:20 +00:00 · 2017-01-06 16:19:20 +00:00 · c8fefc4670
parent 64193078bc
commit c8fefc4670
3 changed files with 3 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ projects/XCode/iOSTest/Build
 *.pyc
 DerivedData
 *.xccheckout
+Build
--- a/.travis.yml
+++ b/.travis.yml
@ -155,7 +155,7 @@ install:
 before_script:
  - export CXX=${COMPILER}
  - cd ${TRAVIS_BUILD_DIR}
-  - cmake -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+  - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
  - cd Build

 script:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(Catch)

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