From 62c724f3f6dd5ddd9dc1ec8a42d18cdd5535f0f2 Mon Sep 17 00:00:00 2001 From: ganome Date: Thu, 30 Jan 2025 23:18:45 -0700 Subject: [PATCH] setup a CMake system for the build - which includes sqlite3 --- CMakeLists.txt | 11 +++++++---- lib/CMakeLists.txt | 8 ++++++++ sqlite3.c => lib/sqlite3.c | 0 {include => src/include}/setcpu.h | 0 {include => src/include}/sethardware.h | 0 {lists => src/lists}/cpu.h | 0 {lists => src/lists}/cpulist | 0 {lists => src/lists}/hardware.h | 0 src/main.cpp | 12 +++++------- 9 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 lib/CMakeLists.txt rename sqlite3.c => lib/sqlite3.c (100%) rename {include => src/include}/setcpu.h (100%) rename {include => src/include}/sethardware.h (100%) rename {lists => src/lists}/cpu.h (100%) rename {lists => src/lists}/cpulist (100%) rename {lists => src/lists}/hardware.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42be0ad..e251275 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,12 @@ -cmake_minimum_requred(VERSION 3.30) +cmake_minimum_required(VERSION 3.30) project(hardwareDB VERSION 0.0.1) +# set(SOURCE_FILES main.cpp) -add_executable(hardwareDB src/main.cpp) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/lists) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -target_link_libraries(${PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/include/sqlite3) +add_executable(${PROJECT_NAME} src/main.cpp) + +add_subdirectory(lib) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 0000000..c9da15b --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,8 @@ + + +add_library(sqlite SHARED sqlite3.c) + +target_include_directories(${PROJECT_NAME} + INTERFACE +${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(${PROJECT_NAME} sqlite) diff --git a/sqlite3.c b/lib/sqlite3.c similarity index 100% rename from sqlite3.c rename to lib/sqlite3.c diff --git a/include/setcpu.h b/src/include/setcpu.h similarity index 100% rename from include/setcpu.h rename to src/include/setcpu.h diff --git a/include/sethardware.h b/src/include/sethardware.h similarity index 100% rename from include/sethardware.h rename to src/include/sethardware.h diff --git a/lists/cpu.h b/src/lists/cpu.h similarity index 100% rename from lists/cpu.h rename to src/lists/cpu.h diff --git a/lists/cpulist b/src/lists/cpulist similarity index 100% rename from lists/cpulist rename to src/lists/cpulist diff --git a/lists/hardware.h b/src/lists/hardware.h similarity index 100% rename from lists/hardware.h rename to src/lists/hardware.h diff --git a/src/main.cpp b/src/main.cpp index 0499e0f..452a062 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,18 +10,16 @@ #include // Begin testing of SQLite3 -int createDB(); -int createTable(); -static int createDB(const char* s); -static int createTable(const char* s); +// static int createDB(const char* s); +// static int createTable(const char* s); int main() { - const char* dbfile = "hardware.db"; - sqlite3* hardwareDB; + // const char* dbfile = "hardware.db"; + // sqlite3* hardwareDB; - createDB(dbfile); + // createDB(dbfile); // createTable(dbfile);