From 8a480a851404617ec3d62b6c2c173b87d5462f83 Mon Sep 17 00:00:00 2001 From: Dnomd343 Date: Sun, 31 Mar 2024 19:13:35 +0800 Subject: [PATCH] refactor: split core ffi module --- src/CMakeLists.txt | 1 + src/core/CMakeLists.txt | 8 ++++---- src/core_ffi/CMakeLists.txt | 8 ++++++++ src/{core/ffi => core_ffi}/all_cases.cc | 0 src/{core/ffi => core_ffi/include}/klotski.h | 0 src/core_test/CMakeLists.txt | 4 +--- 6 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 src/core_ffi/CMakeLists.txt rename src/{core/ffi => core_ffi}/all_cases.cc (100%) rename src/{core/ffi => core_ffi/include}/klotski.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 81ce5a1..3ea04a6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.12) add_subdirectory(core) +add_subdirectory(core_ffi) add_subdirectory(core_test) #project(klotski-cli LANGUAGES C) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 32f0780..034c7e8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -6,7 +6,6 @@ set(CMAKE_CXX_STANDARD 23) set(KLOTSKI_CORE_SRC all_cases/basic_ranges.cc all_cases/all_cases.cc - ffi/all_cases.cc common_code/common_code.cc common_code/serialize.cc common_code/sundry.cc @@ -21,7 +20,8 @@ set(KLOTSKI_CORE_SRC ) add_library(klotski_core STATIC ${KLOTSKI_CORE_SRC}) target_compile_options(klotski_core PRIVATE -fno-rtti -fno-exceptions) +target_include_directories(klotski_core PUBLIC utils all_cases raw_code short_code common_code) -target_include_directories(klotski_core PUBLIC - utils all_cases - raw_code short_code common_code) +# TODO: just for dev testing +add_executable(klotski_core_bin main.cc) +target_link_libraries(klotski_core_bin PRIVATE klotski_core) diff --git a/src/core_ffi/CMakeLists.txt b/src/core_ffi/CMakeLists.txt new file mode 100644 index 0000000..75fb362 --- /dev/null +++ b/src/core_ffi/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.12) +project(core_ffi LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 23) + +add_library(klotski all_cases.cc) +target_include_directories(klotski PUBLIC include) +target_link_libraries(klotski PRIVATE klotski_core) diff --git a/src/core/ffi/all_cases.cc b/src/core_ffi/all_cases.cc similarity index 100% rename from src/core/ffi/all_cases.cc rename to src/core_ffi/all_cases.cc diff --git a/src/core/ffi/klotski.h b/src/core_ffi/include/klotski.h similarity index 100% rename from src/core/ffi/klotski.h rename to src/core_ffi/include/klotski.h diff --git a/src/core_test/CMakeLists.txt b/src/core_test/CMakeLists.txt index 42fc855..e4483e9 100644 --- a/src/core_test/CMakeLists.txt +++ b/src/core_test/CMakeLists.txt @@ -3,15 +3,13 @@ project(core-test LANGUAGES CXX) set(CMAKE_CXX_STANDARD 23) -set(KLOTSKI_TEST_DEPS klotski_core +set(KLOTSKI_TEST_DEPS klotski klotski_core GTest::gtest_main bs::thread_pool md5sum xxHash::xxhash) # ------------------------------------------------------------------------------------ # include_directories(utility) -include_directories(${KLOTSKI_ROOT_DIR}/src/core/ffi) - # ------------------------------------------------------------------------------------ # set(KLOTSKI_TEST_CASES_SRC