diff --git a/CMakeLists.txt b/CMakeLists.txt index 59c1c73..e2e1b97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,14 +5,21 @@ project( VERSION 0.1.0 LANGUAGES CXX) +add_subdirectory(lib_vector_search) + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") include(ExportCompileCommands) include(sccache) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) +add_executable(VectorSearch main.cpp) -add_subdirectory(lib_vector_search) -add_subdirectory(vector_search_cli) +target_link_libraries(VectorSearch lib_vector_search) + +target_compile_features(VectorSearch PUBLIC cxx_std_20) + +set_target_properties( + VectorSearch + PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin" + RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin" + RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin") diff --git a/lib_vector_search/CMakeLists.txt b/lib_vector_search/CMakeLists.txt index edb6b42..570b0ab 100644 --- a/lib_vector_search/CMakeLists.txt +++ b/lib_vector_search/CMakeLists.txt @@ -1,13 +1,15 @@ cmake_minimum_required(VERSION 3.20) project( - vector_search + lib_vector_search VERSION 0.1.0 LANGUAGES CXX) -add_library(vector_search STATIC src/word_list_generator.cpp src/timer.cpp - src/linear_finder.cpp src/parallel_finder.cpp) +add_library( + lib_vector_search STATIC src/word_list_generator.cpp src/timer.cpp + src/linear_finder.cpp src/parallel_finder.cpp) -target_include_directories(vector_search PUBLIC ${PROJECT_SOURCE_DIR}/include) +target_include_directories(lib_vector_search + PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_compile_features(vector_search PUBLIC cxx_std_20) +target_compile_features(lib_vector_search PUBLIC cxx_std_20) diff --git a/vector_search_cli/main.cpp b/main.cpp similarity index 100% rename from vector_search_cli/main.cpp rename to main.cpp diff --git a/vector_search_cli/CMakeLists.txt b/vector_search_cli/CMakeLists.txt deleted file mode 100644 index bf87fc8..0000000 --- a/vector_search_cli/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.20) - -project( - vector_search_cli - VERSION 0.1.0 - LANGUAGES CXX) - -add_executable(vector_search_cli main.cpp) - -target_link_libraries(vector_search_cli vector_search) - -target_compile_features(vector_search_cli PRIVATE cxx_std_20)