diff --git a/.gitignore b/.gitignore
index 2b3942d9..e3f1c775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ projects/XCode/iOSTest/Build
 *.pyc
 DerivedData
 *.xccheckout
+Build
diff --git a/.travis.yml b/.travis.yml
index ae0141f9..13946ae7 100644
--- 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:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4fb704f..eb0e1893 100644
--- 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