Modify namespace scheme for conan-center

astro-informatics · May 14, 2021 · 484f8ad · 484f8ad
1 parent 3cb820a
commit 484f8ad
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/cmake/exporting.cmake b/cmake/exporting.cmake
@@ -1,18 +1,19 @@
 # Exports so3 so other packages can access it
 export(
-  TARGETS so3
-  FILE "${PROJECT_BINARY_DIR}/So3Targets.cmake"
-  NAMESPACE so3)
+  TARGETS astro-informatics-so3
+  FILE "${PROJECT_BINARY_DIR}/astro-informatics-so3Targets.cmake"
+  NAMESPACE astro-informatics-so3::)
 
 # Avoids creating an entry in the cmake registry.
 if(NOT NOEXPORT)
-  export(PACKAGE so3)
+  export(PACKAGE astro-informatics-so3)
 endif()
 
 set(INCLUDE_INSTALL_DIR include/)
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
-  cmake/so3Config.in.cmake "${PROJECT_BINARY_DIR}/so3Config.cmake"
+  cmake/so3Config.in.cmake
+  "${PROJECT_BINARY_DIR}/astro-informatics-so3Config.cmake"
   INSTALL_DESTINATION lib/cmake/so3
   PATH_VARS INCLUDE_INSTALL_DIR)
 write_basic_package_version_file(
@@ -21,12 +22,12 @@ write_basic_package_version_file(
   COMPATIBILITY SameMajorVersion)
 
 if(NOT CONAN_EXPORTED)
-  install(FILES "${PROJECT_BINARY_DIR}/so3Config.cmake"
-                "${PROJECT_BINARY_DIR}/so3ConfigVersion.cmake"
-          DESTINATION lib/cmake/so3)
+  install(FILES "${PROJECT_BINARY_DIR}/astro-informatics-so3Config.cmake"
+                "${PROJECT_BINARY_DIR}/astro-informatics-so3ConfigVersion.cmake"
+          DESTINATION lib/cmake/astro-informatics-so3)
 endif()
 
 install(
   EXPORT so3Targets
-  DESTINATION lib/cmake/so3
-  NAMESPACE so3)
+  DESTINATION lib/cmake/astro-informatics-so3
+  NAMESPACE astro-informatics-so3::)
diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt
@@ -1,19 +1,22 @@
-add_library(so3 STATIC so3_core.c so3_sampling.c so3_adjoint.c so3_conv.c)
-target_link_libraries(so3 PUBLIC ssht::ssht FFTW3::FFTW3 ${MATH_LIBRARY})
+add_library(astro-informatics-so3 STATIC so3_core.c so3_sampling.c
+                                         so3_adjoint.c so3_conv.c)
+target_link_libraries(astro-informatics-so3 PUBLIC ssht::ssht FFTW3::FFTW3
+                                                   ${MATH_LIBRARY})
 target_include_directories(
-  so3
+  astro-informatics-so3
   PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
          $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
          $<INSTALL_INTERFACE:include>)
-set_target_properties(so3 PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY
-                                                   ${PROJECT_BINARY_DIR}/lib)
-target_compile_features(so3 PUBLIC c_std_99)
+set_target_properties(
+  astro-informatics-so3 PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY
+                                                 ${PROJECT_BINARY_DIR}/lib)
+target_compile_features(astro-informatics-so3 PUBLIC c_std_99)
 configure_file(${PROJECT_SOURCE_DIR}/include/so3/so3_version.in.h
                ${PROJECT_BINARY_DIR}/include/so3/so3_version.h)
 
 if(NOT SKBUILD)
   install(
-    TARGETS so3
+    TARGETS astro-informatics-so3
     EXPORT so3Targets
     ARCHIVE DESTINATION lib
     PUBLIC_HEADER)

diff --git a/src/so3/CMakeLists.txt b/src/so3/CMakeLists.txt
@@ -3,9 +3,9 @@ add_cython_target(cython_sources bindings.pyx C PY3)
 
 add_library(bindings MODULE ${cython_sources})
 python_extension_module(bindings)
-target_link_libraries(bindings so3)
+target_link_libraries(bindings astro-informatics-so3)
 target_include_directories(bindings PUBLIC ${NumPy_INCLUDE_DIRS})
 if(WIN32)
-    target_compile_definitions(bindings PUBLIC MS_WIN64)
+  target_compile_definitions(bindings PUBLIC MS_WIN64)
 endif()
 install(TARGETS bindings LIBRARY DESTINATION src/so3)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_library(utilities OBJECT utilities.c)
-target_link_libraries(utilities PUBLIC so3)
+target_link_libraries(utilities PUBLIC astro-informatics-so3)
 foreach(testname sampling so3 convolution)
   add_executable(test_${testname} test_${testname}.c)
-  target_link_libraries(test_${testname} PRIVATE so3 cmocka)
+  target_link_libraries(test_${testname} PRIVATE astro-informatics-so3 cmocka)
   set_target_properties(
     test_${testname} PROPERTIES C_STANDARD 11 RUNTIME_OUTPUT_DIRECTORY
                                               ${PROJECT_BINARY_DIR}/bin)