From d99a02dcf7b4672d12874c11fbf1329751311f90 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Wed, 14 Feb 2024 00:11:40 +0100 Subject: [PATCH 1/2] Introduce the HICTKPY_PROJECT_TOP_LEVEL_INCLUDES build knob to disable conan --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 51636bb..ee8ac98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ cmake.build-type = "Release" [tool.scikit-build.cmake.define] CMAKE_OSX_DEPLOYMENT_TARGET = "10.15" -CMAKE_PROJECT_TOP_LEVEL_INCLUDES = "cmake/conan_provider.cmake" +CMAKE_PROJECT_TOP_LEVEL_INCLUDES = {env="HICTKPY_PROJECT_TOP_LEVEL_INCLUDES", default="cmake/conan_provider.cmake" } HICTK_ENABLE_TESTING = "OFF" HICTK_BUILD_EXAMPLES = "OFF" HICTK_BUILD_BENCHMARKS = "OFF" From 78a3b56c51a8d12ff4687ac9428134bd2e725fd1 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:49:59 +0100 Subject: [PATCH 2/2] Format project --- CMakeLists.txt | 12 ++++++------ pyproject.toml | 2 +- src/CMakeLists.txt | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cad4836..0ec4ca1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,15 +26,15 @@ project( include(FetchContent) FetchContent_Declare( hictk - URL "${CMAKE_CURRENT_SOURCE_DIR}/external/hictk-v0.0.3.tar.xz" - URL_HASH "SHA256=c003924e92a9957a0cf43b85ae9ede29392be5227f427ca2fab9e420ea8217c9" + URL "${CMAKE_CURRENT_SOURCE_DIR}/external/hictk-v0.0.3.tar.xz" + URL_HASH "SHA256=c003924e92a9957a0cf43b85ae9ede29392be5227f427ca2fab9e420ea8217c9" SYSTEM) FetchContent_Declare( - nanobind - URL "${CMAKE_CURRENT_SOURCE_DIR}/external/nanobind-v1.8.0.tar.xz" - URL_HASH "SHA256=e70b23b82582aa6394bc8d8604c3736d2f1d8eeae15c309cd7cc37093aa4c406" - SYSTEM) + nanobind + URL "${CMAKE_CURRENT_SOURCE_DIR}/external/nanobind-v1.8.0.tar.xz" + URL_HASH "SHA256=e70b23b82582aa6394bc8d8604c3736d2f1d8eeae15c309cd7cc37093aa4c406" + SYSTEM) set(HICTK_ENABLE_TESTING OFF) set(HICTK_BUILD_EXAMPLES OFF) diff --git a/pyproject.toml b/pyproject.toml index ee8ac98..1a03623 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ cmake.build-type = "Release" [tool.scikit-build.cmake.define] CMAKE_OSX_DEPLOYMENT_TARGET = "10.15" -CMAKE_PROJECT_TOP_LEVEL_INCLUDES = {env="HICTKPY_PROJECT_TOP_LEVEL_INCLUDES", default="cmake/conan_provider.cmake" } +CMAKE_PROJECT_TOP_LEVEL_INCLUDES = { env="HICTKPY_PROJECT_TOP_LEVEL_INCLUDES", default="cmake/conan_provider.cmake" } HICTK_ENABLE_TESTING = "OFF" HICTK_BUILD_EXAMPLES = "OFF" HICTK_BUILD_BENCHMARKS = "OFF" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a23d98e..661d729 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,8 @@ find_package( nanobind_add_module( _hictkpy - NB_STATIC LTO + NB_STATIC + LTO MODULE hictkpy.cpp hictkpy_file.cpp