]> git.lizzy.rs Git - linenoise.git/commitdiff
Use CMake master
authorElias Fleckenstein <eliasfleckenstein@web.de>
Mon, 25 Apr 2022 09:46:14 +0000 (11:46 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Mon, 25 Apr 2022 09:46:14 +0000 (11:46 +0200)
.gitignore
CMakeLists.txt [new file with mode: 0644]
Makefile [deleted file]

index f01a0a0a5e207caac4f58790e8fb39ddbe0d672e..3d4b7d47a6197c45bac373c60aa0d956d7713a6b 100644 (file)
@@ -1,2 +1,15 @@
-linenoise_example
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+*.a
 *.exe
+linenoise_example
+linenoise_utf8_example
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4a75aa0
--- /dev/null
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.14)
+project(Linenoise)
+
+add_library(linenoise
+       linenoise.c
+       stringbuf.c
+       utf8.c
+)
+
+target_include_directories(linenoise
+       PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_executable(linenoise_example example.c)
+target_link_libraries(linenoise_example linenoise)
+
+add_executable(linenoise_utf8_example example.c)
+target_link_libraries(linenoise_utf8_example linenoise)
+target_compile_definitions(linenoise_utf8_example PUBLIC USE_UTF8)
+
diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index d8746ab..0000000
--- a/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CFLAGS += -Wall -W -Os -g
-CC ?= gcc
-
-all:  linenoise_example linenoise_utf8_example
-
-linenoise_example: linenoise.h linenoise-ship.c linenoise-win32.c example.c
-       $(CC) $(CFLAGS) -o $@ linenoise-ship.c example.c
-
-linenoise_utf8_example: linenoise.h linenoise-ship.c linenoise-win32.c
-       $(CC) $(CFLAGS) -DUSE_UTF8 -o $@ linenoise-ship.c example.c
-
-clean:
-       rm -f linenoise_example linenoise_utf8_example linenoise-ship.c *.o
-
-ship: linenoise-ship.c
-
-# linenoise-ship.c simplifies delivery of linenoise support
-# simple copy linenoise-ship.c to linenoise.c in your application, and also linenoise.h
-# - If you want win32 support, also copy linenoise-win32.c
-# - If you never want to support utf-8, you can omit utf8.h and utf8.c
-
-linenoise-ship.c: utf8.h utf8.c stringbuf.h stringbuf.c linenoise.c
-       cat $^ >$@