build: switched from make to cmake

DavidLeeds · Jul 11, 2018 · 1a5bac8 · 1a5bac8
1 parent 9e00b36
commit 1a5bac8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,4 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
+/build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(hashmap)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused -Werror")
+
+file(GLOB SOURCES src/*.c)
+
+# Shared library
+add_library(hashmap SHARED ${SOURCES})
+target_include_directories(hashmap PUBLIC src)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused -Werror")
+
+# Build hashmap library with metrics enabled
+add_definitions(-DHASHMAP_METRICS)
+
+include_directories(../src)
+
+add_executable(hashmap_test ../src/hashmap.c hashmap_test.c)
diff --git a/test/Makefile b/test/Makefile
diff --git a/test/hashmap_test.c b/test/hashmap_test.c
@@ -485,7 +485,7 @@ bool test_reset(struct hashmap *map, void **keys)
     return true;
 }
 
-const struct test const tests[] = {
+const struct test tests[] = {
         {
                 .name = "put performance",
                 .description = "put new hash keys",