Skip to content

Commit 9c22804

Browse files
committed
Update build system
1 parent 17a7f72 commit 9c22804

File tree

11 files changed

+889
-108
lines changed

11 files changed

+889
-108
lines changed

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,16 @@ MANIFEST
1919
dist/
2020
compile_commands.json
2121
.clangd/
22+
# Devenv
23+
.devenv*
24+
devenv.local.nix
25+
26+
# direnv
27+
.direnv
28+
devenv.nix
29+
.envrc
30+
devenv.yaml
31+
devenv.lock
32+
33+
# pre-commit
34+
.pre-commit-config.yaml

CMakeLists.txt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
cmake_minimum_required(VERSION 3.12)
2-
1+
cmake_minimum_required(VERSION 3.24)
2+
if(NOT SKBUILD_PROJECT_NAME)
3+
set(project_name Ssht)
4+
else()
5+
set(project_name ${SKBUILD_PROJECT_NAME})
6+
endif()
37
project(
4-
Ssht
8+
${SKBUILD_PROJECT_NAME}
59
VERSION "1.5.2"
610
DESCRIPTION "Fast and exact spin spherical harmonic transforms"
711
HOMEPAGE_URL "http://astro-informatics.github.io/ssht/"
@@ -13,12 +17,8 @@ if(NOT CMAKE_BUILD_TYPE)
1317
set(CMAKE_BUILD_TYPE Debug)
1418
endif()
1519
include(CTest)
16-
if(conan_deps OR CONAN_EDITABLE_MODE)
17-
include("${PROJECT_SOURCE_DIR}/cmake/conan_dependencies.cmake")
18-
endif()
19-
if(EXISTS "${PROJECT_BINARY_DIR}/conan_paths.cmake")
20-
include("${PROJECT_BINARY_DIR}/conan_paths.cmake")
21-
elseif(EXISTS "${PROJECT_BINARY_DIR}/FindFFTW3.cmake")
20+
21+
if(EXISTS "${PROJECT_BINARY_DIR}/FindFFTW3.cmake")
2222
list(APPEND CMAKE_MODULE_PATH "${PROJECT_BINARY_DIR}")
2323
else()
2424
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
@@ -33,16 +33,17 @@ if(BUILD_TESTING)
3333
endif()
3434

3535
if(SKBUILD)
36-
find_package(PythonExtensions REQUIRED)
37-
find_package(Cython REQUIRED)
38-
find_package(NumPy REQUIRED)
36+
find_package(
37+
Python
38+
COMPONENTS Interpreter Development.Module NumPy
39+
REQUIRED)
3940
add_subdirectory(src/pyssht)
4041
elseif(NOT CONAN_EXPORTED)
4142
include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
4243
endif()
4344

4445
# only run documentation if this is not a sub-project
45-
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
46+
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT SKBUILD)
4647
find_package(Doxygen)
4748
if(DOXYGEN_FOUND)
4849
set(DOXYGEN_OPTIMIZE_OUTPUT_FOR_C "YES")

cmake/conan_dependencies.cmake

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)