Updated CMakeLists

Author: rijnb

.gitignore

@@ -6,6 +6,11 @@ unittest/*.gcno
 mapcodelib/*.gcov
 mapcodelib/*.gcda
 mapcodelib/*.gcno
+CMakeCache.txt
+CMakeFiles/**
+Makefile
+cmake_install.cmake
+*.a
 
 # -----------------------------------------------------------------------------
 # Compiled sources

CMakeLists.txt

@@ -58,17 +58,16 @@ set(SOURCE_FILES_MAPCODELIB
         mapcodelib/mapcoder.c
         mapcodelib/mapcoder.h)
 
-set(SOURCE_FILES_UNITTEST
-        unittest/decode_test.h
-        unittest/unittest.c)
+set(SOURCE_FILES_TEST
+        test/decode_test.h
+        test/unittest.c)
 
 set(SOURCE_FILES_UTILITY
         utility/mapcode.cpp)
 
 add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB})
-target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(unittest ${SOURCE_FILES_UNITTEST})
+add_executable(unittest ${SOURCE_FILES_TEST})
 target_link_libraries(unittest LINK_PUBLIC mapcodelib)
 
 add_executable(mapcode ${SOURCE_FILES_UTILITY})

README.md

@@ -32,8 +32,8 @@ Documentation, including example snippets of C source code, can be found in
       mapcode_library_c.pdf         <-- PDF format.
       mapcode_library_c.doc         <-- Microsoft Word format.
 
-A unit test can be found in the unittest\ subdirectory.
-Compile and run unittest\unittest/c to see if the library performs as expected.
+A unit test can be found in the test\ subdirectory.
+Compile and run test/unittest.c to see if the library performs as expected.
 
 Also see www.mapcode.com for background and reference materials.
 

unittest/README.md renamed to test/README.md

@@ -28,7 +28,7 @@ cd ../mapcodelib
 gcc $OPTS -O3 -c mapcoder.c
 cd ../utility
 gcc $OPTS -O3 mapcode.cpp -lm -o mapcode ../mapcodelib/mapcoder.o
-cd ../unittest
+cd ../test
 
 TEST=`which $NEW`
 if [ "$TEST" = "" ]

unittest/alphabets.csv renamed to test/alphabets.csv

@@ -10,7 +10,7 @@ then
 fi
 
 echo "!! -------------------------------------------------------------"
-echo "Run gcov test coverage..."
+echo "Run gcov unittest.coverage..."
 date
 echo "!! -------------------------------------------------------------"
 
@@ -23,7 +23,7 @@ gcc $OPTS -O0 unittest.c -lm -lpthread -o unittest $LIB
 ./unittest
 cd ../mapcodelib
 gcov mapcoder.c
-cd ../unittest
+cd ../test
 gcov unittest.c
 echo "!! -------------------------------------------------------------"
 echo "!! Coverage reports in: *.gcov files"