diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
new file mode 100644
index 00000000..e704f0c5
--- /dev/null
+++ b/cpp/CMakeLists.txt
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(cpp)
+
+# CMake FindThreads is broken until 3.1
+#find_package(Threads REQUIRED)
+set(CMAKE_THREAD_LIBS_INIT pthread)
+
+enable_testing()
+find_package(GTest REQUIRED)
+include_directories(${GTEST_INCLUDE_DIRS})
+
+set(GILDED_ROSE_SOURCE_FILES
+    GildedRose.cc
+    GildedRose.h
+    GildedRoseUnitTests.cc)
+
+set(GILDED_ROSE_TEXT_TESTS_SOURCE_FILES
+    GildedRose.cc
+    GildedRose.h
+    GildedRoseTextTests.cc)
+
+set(SOURCE_FILES
+    ${GILDED_ROSE_SOURCE_FILES}
+    ${GILDED_ROSE_TEXT_TESTS_SOURCE_FILES})
+
+add_executable(GildedRose ${GILDED_ROSE_SOURCE_FILES})
+target_link_libraries(GildedRose ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+add_executable(GildedRoseTextTests ${GILDED_ROSE_TEXT_TESTS_SOURCE_FILES})
+target_link_libraries(GildedRoseTextTests ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})