Consolidate CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49c9fade28e17995f9ab8f0553e6e6eefff40f5a..667d2881d57544457316c812dade0ffe85f51007 100644 (file)
--- a/CMakeLists.txt
+++ b/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)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
deleted file mode 100644 (file)
index 255e01c..0000000
--- a/samples/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_executable (sample docsample.cpp)

diff --git a/samples/Makefile b/samples/Makefile
deleted file mode 100644 (file)
index 6cdd3c8..0000000
--- a/samples/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-CC = g++
-CFLAGS = -g -Wall -pedantic
-
-docsample: docsample.cpp ../source/utf8.h
-       $(CC) $(CFLAGS) docsample.cpp -odocsample

diff --git a/test_drivers/CMakeLists.txt b/test_drivers/CMakeLists.txt
deleted file mode 100644 (file)
index 78822a1..0000000
--- a/test_drivers/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory (negative)

diff --git a/test_drivers/Makefile b/test_drivers/Makefile
deleted file mode 100644 (file)
index a2cbe4c..0000000
--- a/test_drivers/Makefile
+++ /dev/null
@@ -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

diff --git a/test_drivers/negative/CMakeLists.txt b/test_drivers/negative/CMakeLists.txt
deleted file mode 100644 (file)
index f0d5e15..0000000
--- a/test_drivers/negative/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_executable (negative negative.cpp)
\ No newline at end of file

diff --git a/test_drivers/negative/Makefile b/test_drivers/negative/Makefile
deleted file mode 100644 (file)
index 00f4a7d..0000000
--- a/test_drivers/negative/Makefile
+++ /dev/null
@@ -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

diff --git a/test_drivers/smoke_test/Makefile b/test_drivers/smoke_test/Makefile
deleted file mode 100644 (file)
index f66f3af..0000000
--- a/test_drivers/smoke_test/Makefile
+++ /dev/null
@@ -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

diff --git a/test_drivers/utf8reader/Makefile b/test_drivers/utf8reader/Makefile
deleted file mode 100644 (file)
index 29a9aa8..0000000
--- a/test_drivers/utf8reader/Makefile
+++ /dev/null
@@ -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