pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 8e0eb68..0131d4e 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -109,7 +109,7 @@ if (BUILD_PYTHON_INTERFACE OR BUILD_MATLAB_INTERFACE)
6 include(FetchContent)
7 FetchContent_Declare(
8 cpu_features
9- URL https://github.com/google/cpu_features/archive/refs/tags/v0.10.1.zip
10+ URL @cpu_features_src@
11 )
12 set(BUILD_SHARED_LIBS_COPY ${BUILD_SHARED_LIBS})
13 set(BUILD_SHARED_LIBS OFF)
14diff --git a/interfaces/c/tests/CMakeLists.txt b/interfaces/c/tests/CMakeLists.txt
15index 5919593..bf504c5 100644
16--- a/interfaces/c/tests/CMakeLists.txt
17+++ b/interfaces/c/tests/CMakeLists.txt
18@@ -17,18 +17,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30.0")
19 endif()
20
21 # Google Test
22-include(FetchContent)
23-FetchContent_Declare(
24- googletest
25- URL https://github.com/google/googletest/archive/86add13493e5c881d7e4ba77fb91c1f57752b3a4.zip
26-)
27-# For Windows: Prevent overriding the parent project's compiler/linker settings
28-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
29-FetchContent_GetProperties(googletest)
30-if(NOT googletest_POPULATED)
31- FetchContent_Populate(googletest)
32- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
33-endif()
34+# Use find_package to use the gtest package provided by Nix
35+find_package(GTest REQUIRED)
36
37 enable_testing()
38
39diff --git a/interfaces/python/CMakeLists.txt b/interfaces/python/CMakeLists.txt
40index b2e3cef..3d9cf65 100644
41--- a/interfaces/python/CMakeLists.txt
42+++ b/interfaces/python/CMakeLists.txt
43@@ -13,16 +13,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
44 cmake_policy(SET CMP0135 OLD)
45 endif()
46
47-# Find pybind11
48-set(PYBIND11_FINDPYTHON ON)
49-find_package(pybind11 CONFIG REQUIRED)
50-
51-# detect arm64 cross compilation on macOS
52-if(DEFINED ENV{_PYTHON_HOST_PLATFORM})
53- if($ENV{_PYTHON_HOST_PLATFORM} MATCHES "arm64")
54- set(CMAKE_SYSTEM_PROCESSOR "arm64")
55- endif()
56-endif()
57+find_package(pybind11 REQUIRED)
58
59 # add instruction set detection on x86/amd64
60 pybind11_add_module(instruction_set src/instruction_set.cpp)
61diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
62index fded71a..cb568a7 100644
63--- a/tests/CMakeLists.txt
64+++ b/tests/CMakeLists.txt
65@@ -14,18 +14,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
66 endif()
67
68 # Google Test
69-include(FetchContent)
70-FetchContent_Declare(
71- googletest
72- URL https://github.com/google/googletest/archive/86add13493e5c881d7e4ba77fb91c1f57752b3a4.zip
73-)
74-# For Windows: Prevent overriding the parent project's compiler/linker settings
75-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
76-FetchContent_GetProperties(googletest)
77-if(NOT googletest_POPULATED)
78- FetchContent_Populate(googletest)
79- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
80-endif()
81+# Use find_package to use the gtest package provided by Nix
82+find_package(GTest REQUIRED)
83
84 enable_testing()
85