clean up install for SKBUILD and check naming

LLNL · Dec 20, 2024 · a6e8afe · a6e8afe
1 parent 3d25411
commit a6e8afe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/python/units_python.cpp b/python/units_python.cpp
@@ -13,7 +13,7 @@ namespace nb = nanobind;
 
 using namespace nb::literals;
 
-NB_MODULE(units_llnl, mod)
+NB_MODULE(units_llnl_ext, mod)
 {
     mod.doc() =
         "A minimal Python extension for the llnl/units C++ library.\n"

diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
@@ -83,7 +83,7 @@ if(UNITS_BUILD_SHARED_LIBRARY)
     if(CMAKE_CXX_STANDARD GREATER 16)
         target_compile_definitions(units PRIVATE -DUNITS_CONSTEXPR_IF_SUPPORTED=1)
     endif()
-    if(UNITS_INSTALL)
+    if(UNITS_INSTALL AND NOT SKBUILD)
         install(
             TARGETS units ${UNITS_LIBRARY_EXPORT_COMMAND}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -156,7 +156,7 @@ elseif(UNITS_BUILD_STATIC_LIBRARY)
     if(CMAKE_CXX_STANDARD GREATER 16)
         target_compile_definitions(units PRIVATE -DUNITS_CONSTEXPR_IF_SUPPORTED=1)
     endif()
-    if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL)
+    if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL AND NOT SKBUILD)
         install(TARGETS units ${UNITS_LIBRARY_EXPORT_COMMAND}
                 DESTINATION ${CMAKE_INSTALL_LIBDIR} # INCLUDES DESTINATION
                                                     # include/${PROJECT_NAME}
@@ -179,7 +179,7 @@ target_include_directories(
                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 target_compile_definitions(header_only INTERFACE UNITS_HEADER_ONLY)
-if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL)
+if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_ AND NOT SKBUILD)
     install(TARGETS header_only ${UNITS_LIBRARY_EXPORT_COMMAND})
 endif()
 if(UNITS_NAMESPACE)
@@ -194,7 +194,7 @@ if(UNITS_BASE_TYPE)
 endif()
 add_library(${UNITS_LC_PROJECT_NAME}::header_only ALIAS header_only)
 
-if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL)
+if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL AND NOT SKBUILD)
     install(FILES ${units_header_files}
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${UNITS_LC_PROJECT_NAME}
     )