Skip to content

Commit 484f8ad

Browse files
committed
Modify namespace scheme for conan-center
1 parent 3cb820a commit 484f8ad

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

cmake/exporting.cmake

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# Exports so3 so other packages can access it
22
export(
3-
TARGETS so3
4-
FILE "${PROJECT_BINARY_DIR}/So3Targets.cmake"
5-
NAMESPACE so3)
3+
TARGETS astro-informatics-so3
4+
FILE "${PROJECT_BINARY_DIR}/astro-informatics-so3Targets.cmake"
5+
NAMESPACE astro-informatics-so3::)
66

77
# Avoids creating an entry in the cmake registry.
88
if(NOT NOEXPORT)
9-
export(PACKAGE so3)
9+
export(PACKAGE astro-informatics-so3)
1010
endif()
1111

1212
set(INCLUDE_INSTALL_DIR include/)
1313
include(CMakePackageConfigHelpers)
1414
configure_package_config_file(
15-
cmake/so3Config.in.cmake "${PROJECT_BINARY_DIR}/so3Config.cmake"
15+
cmake/so3Config.in.cmake
16+
"${PROJECT_BINARY_DIR}/astro-informatics-so3Config.cmake"
1617
INSTALL_DESTINATION lib/cmake/so3
1718
PATH_VARS INCLUDE_INSTALL_DIR)
1819
write_basic_package_version_file(
@@ -21,12 +22,12 @@ write_basic_package_version_file(
2122
COMPATIBILITY SameMajorVersion)
2223

2324
if(NOT CONAN_EXPORTED)
24-
install(FILES "${PROJECT_BINARY_DIR}/so3Config.cmake"
25-
"${PROJECT_BINARY_DIR}/so3ConfigVersion.cmake"
26-
DESTINATION lib/cmake/so3)
25+
install(FILES "${PROJECT_BINARY_DIR}/astro-informatics-so3Config.cmake"
26+
"${PROJECT_BINARY_DIR}/astro-informatics-so3ConfigVersion.cmake"
27+
DESTINATION lib/cmake/astro-informatics-so3)
2728
endif()
2829

2930
install(
3031
EXPORT so3Targets
31-
DESTINATION lib/cmake/so3
32-
NAMESPACE so3)
32+
DESTINATION lib/cmake/astro-informatics-so3
33+
NAMESPACE astro-informatics-so3::)

src/c/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
add_library(so3 STATIC so3_core.c so3_sampling.c so3_adjoint.c so3_conv.c)
2-
target_link_libraries(so3 PUBLIC ssht::ssht FFTW3::FFTW3 ${MATH_LIBRARY})
1+
add_library(astro-informatics-so3 STATIC so3_core.c so3_sampling.c
2+
so3_adjoint.c so3_conv.c)
3+
target_link_libraries(astro-informatics-so3 PUBLIC ssht::ssht FFTW3::FFTW3
4+
${MATH_LIBRARY})
35
target_include_directories(
4-
so3
6+
astro-informatics-so3
57
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
68
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
79
$<INSTALL_INTERFACE:include>)
8-
set_target_properties(so3 PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY
9-
${PROJECT_BINARY_DIR}/lib)
10-
target_compile_features(so3 PUBLIC c_std_99)
10+
set_target_properties(
11+
astro-informatics-so3 PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY
12+
${PROJECT_BINARY_DIR}/lib)
13+
target_compile_features(astro-informatics-so3 PUBLIC c_std_99)
1114
configure_file(${PROJECT_SOURCE_DIR}/include/so3/so3_version.in.h
1215
${PROJECT_BINARY_DIR}/include/so3/so3_version.h)
1316

1417
if(NOT SKBUILD)
1518
install(
16-
TARGETS so3
19+
TARGETS astro-informatics-so3
1720
EXPORT so3Targets
1821
ARCHIVE DESTINATION lib
1922
PUBLIC_HEADER)

src/so3/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ add_cython_target(cython_sources bindings.pyx C PY3)
33

44
add_library(bindings MODULE ${cython_sources})
55
python_extension_module(bindings)
6-
target_link_libraries(bindings so3)
6+
target_link_libraries(bindings astro-informatics-so3)
77
target_include_directories(bindings PUBLIC ${NumPy_INCLUDE_DIRS})
88
if(WIN32)
9-
target_compile_definitions(bindings PUBLIC MS_WIN64)
9+
target_compile_definitions(bindings PUBLIC MS_WIN64)
1010
endif()
1111
install(TARGETS bindings LIBRARY DESTINATION src/so3)

tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
add_library(utilities OBJECT utilities.c)
2-
target_link_libraries(utilities PUBLIC so3)
2+
target_link_libraries(utilities PUBLIC astro-informatics-so3)
33
foreach(testname sampling so3 convolution)
44
add_executable(test_${testname} test_${testname}.c)
5-
target_link_libraries(test_${testname} PRIVATE so3 cmocka)
5+
target_link_libraries(test_${testname} PRIVATE astro-informatics-so3 cmocka)
66
set_target_properties(
77
test_${testname} PROPERTIES C_STANDARD 11 RUNTIME_OUTPUT_DIRECTORY
88
${PROJECT_BINARY_DIR}/bin)

0 commit comments

Comments
 (0)