From e49a63cc96f267173daa22718a6509d7e1e38dca Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sun, 27 Oct 2024 08:38:38 +0100 Subject: [PATCH] move keyvi source out of src --- python-pybind/CMakeLists.txt | 4 ++-- python-pybind/MANIFEST.in | 4 ++-- python-pybind/setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python-pybind/CMakeLists.txt b/python-pybind/CMakeLists.txt index b4e96bf17..0aae24a51 100644 --- a/python-pybind/CMakeLists.txt +++ b/python-pybind/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.4...3.18) project(keyvi_pybind11) add_subdirectory(pybind11) -add_subdirectory(src/keyvi) +add_subdirectory(keyvi_cpp) FILE(GLOB_RECURSE KEYVI_PYBIND_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*.cpp) pybind11_add_module(keyvi_pybind11 ${KEYVI_PYBIND_SOURCES}) @@ -11,4 +11,4 @@ pybind11_add_module(keyvi_pybind11 ${KEYVI_PYBIND_SOURCES}) # define (VERSION_INFO) here. target_compile_definitions(keyvi_pybind11 PRIVATE VERSION_INFO=${KEYVI_VERSION_INFO}) -target_link_libraries(keyvi_pybind11 PRIVATE keyvi) \ No newline at end of file +target_link_libraries(keyvi_pybind11 PRIVATE keyvi) diff --git a/python-pybind/MANIFEST.in b/python-pybind/MANIFEST.in index b51c05aaf..46937b7fc 100644 --- a/python-pybind/MANIFEST.in +++ b/python-pybind/MANIFEST.in @@ -2,5 +2,5 @@ include README.md LICENSE pybind11/LICENSE graft pybind11/include graft pybind11/tools graft src -prune src/keyvi/keyvi/tests -global-include CMakeLists.txt *.cmake +recursive-include keyvi_cpp/keyvi *.h *.hpp +global-include CMakeLists.txt *.cmake *.cmake.in diff --git a/python-pybind/setup.py b/python-pybind/setup.py index b84842c8a..d0ec81190 100644 --- a/python-pybind/setup.py +++ b/python-pybind/setup.py @@ -32,7 +32,7 @@ @contextmanager def symlink_keyvi(): keyvi_cpp_source = "../keyvi" - keyvi_cpp = "src/keyvi" + keyvi_cpp = "keyvi_cpp" keyvi_cpp_link = os.path.join(keyvi_cpp, "keyvi") if not os.path.exists(keyvi_cpp_link): try: