Consolidate CMakeLists.txt

The build has only one CMakeLists.txt now.
Added support for CTest

CMakeLists.txt

@@ -1,6 +1,13 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.0)
 project (utf8cpp)
-
 include_directories ("${PROJECT_SOURCE_DIR}/source")
-add_subdirectory (samples)
-add_subdirectory (test_drivers)
+
+add_executable(smoke ${PROJECT_SOURCE_DIR}/test_drivers/smoke_test/test.cpp)
+add_executable(negative ${PROJECT_SOURCE_DIR}/test_drivers/negative/negative.cpp)
+add_executable(utf8reader ${PROJECT_SOURCE_DIR}/test_drivers/utf8reader/utf8reader.cpp)
+
+add_executable(docsample ${PROJECT_SOURCE_DIR}/samples/docsample.cpp)
+
+enable_testing()
+add_test(smoke_test smoke)
+add_test(negative_test negative ${PROJECT_SOURCE_DIR}/test_data/negative/utf8_invalid.txt)

samples/CMakeLists.txt

@@ -1 +0,0 @@
-add_executable (sample docsample.cpp)

samples/Makefile

@@ -1,5 +0,0 @@
-CC = g++
-CFLAGS = -g -Wall -pedantic
-
-docsample: docsample.cpp ../source/utf8.h
-	$(CC) $(CFLAGS) docsample.cpp -odocsample

test_drivers/CMakeLists.txt

@@ -1 +0,0 @@
-add_subdirectory (negative)

test_drivers/Makefile

@@ -1,19 +0,0 @@
-CC = g++
-CFLAGS = -g
-
-all: smoketest regressiontest negativetest utf8readertest
-
-smoketest:
-	cd smoke_test &&  $(MAKE) $@
-
-regressiontest:
-	cd regression_tests &&  $(MAKE) $@
-
-negativetest:
-	cd negative &&  $(MAKE) $@
-
-utf8readertest:
-	cd utf8reader &&  $(MAKE) $@
-
-clean: 
-	rm smoke_test/smoketest regression_tests/regressiontest negative/negative utf8reader/utf8reader

test_drivers/negative/CMakeLists.txt

@@ -1 +0,0 @@
-add_executable (negative negative.cpp)

test_drivers/negative/Makefile

@@ -1,5 +0,0 @@
-CC = g++
-CFLAGS = -g -Wall -pedantic
-
-negativetest: negative.cpp ../../source/utf8.h ../../source/utf8/core.h ../../source/utf8/checked.h ../../source/utf8/unchecked.h
-	$(CC) $(CFLAGS) negative.cpp -onegative

test_drivers/smoke_test/Makefile

@@ -1,5 +0,0 @@
-CC = g++
-CFLAGS = -g -Wall
-
-smoketest: test.cpp ../../source/utf8.h ../../source/utf8/core.h ../../source/utf8/checked.h ../../source/utf8/unchecked.h
-	$(CC) $(CFLAGS) test.cpp -osmoketest

test_drivers/utf8reader/Makefile

@@ -1,5 +0,0 @@
-CC = g++
-CFLAGS = -g -Wall -pedantic
-
-utf8readertest: utf8reader.cpp ../../source/utf8.h ../../source/utf8/core.h ../../source/utf8/checked.h ../../source/utf8/unchecked.h
-	$(CC) $(CFLAGS) utf8reader.cpp -o utf8reader