meta: Restructure project

CMakeLists.txt

@@ -1,20 +1,23 @@
-# CMakeLists.txt
-# CMakeLists file for OMKOV lib
-
 CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
-PROJECT(lib C)
+PROJECT(lib VERSION 0.0.0 LANGUAGES C)
 
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
 SET(CMAKE_STATIC_LIBRARY_PREFIX "")
 
-FILE(GLOB LIBSRC ${PROJECT_SOURCE_DIR}/src/lib/*)
+FILE(GLOB SOURCES ${PROJECT_SOURCE_DIR}/src/*)
 
-ADD_LIBRARY(lib STATIC ${LIBSRC})
+ADD_LIBRARY(lib STATIC ${SOURCES})
 
 LINK_LIBRARIES(lib)
 
-ADD_EXECUTABLE(test_crypt  ${PROJECT_SOURCE_DIR}/src/test_crypt.c)
-ADD_EXECUTABLE(test_endian ${PROJECT_SOURCE_DIR}/src/test_endian.c)
-ADD_EXECUTABLE(test_error  ${PROJECT_SOURCE_DIR}/src/test_error.c)
-ADD_EXECUTABLE(test_optget ${PROJECT_SOURCE_DIR}/src/test_optget.c)
+ADD_EXECUTABLE(test_crypt  ${PROJECT_SOURCE_DIR}/src/test/test_crypt.c)
+ADD_EXECUTABLE(test_endian ${PROJECT_SOURCE_DIR}/src/test/test_endian.c)
+ADD_EXECUTABLE(test_error  ${PROJECT_SOURCE_DIR}/src/test/test_error.c)
+ADD_EXECUTABLE(test_optget ${PROJECT_SOURCE_DIR}/src/test/test_optget.c)
+
+ENABLE_TESTING()
+ADD_TEST(NAME test_crypt  COMMAND test_crypt)
+ADD_TEST(NAME test_endian COMMAND test_endian)
+ADD_TEST(NAME test_error  COMMAND test_error)
+ADD_TEST(NAME test_optget COMMAND test_optget)

TestUNIX.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+(cd "$(dirname $(realpath "$0"))/build"; ctest)

src/test/test_crypt.c

@@ -17,7 +17,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#include "lib/crypt.h"
+#include "../crypt.h"
 #include "unit.h"
 
 #include <stdint.h>

src/test/test_endian.c

@@ -17,7 +17,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#include "lib/endian.h"
+#include "../endian.h"
 #include "unit.h"
 
 #include <stdint.h>

src/test/test_error.c

@@ -3,7 +3,7 @@
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
-#include "lib/error.h"
+#include "../error.h"
 
 int main(int ac, char *av[]) { A0 = av[0];
 	warn("%s: %s", "warn", serr());

src/test/test_optget.c

@@ -3,7 +3,7 @@
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
-#include "lib/optget.h"
+#include "../optget.h"
 #include "unit.h"
 
 #include <stdbool.h>