Moving module install location back to under lib

Author: gershnik

cmake/install.cmake

@@ -12,7 +12,7 @@ include(CMakePackageConfigHelpers)
 install(TARGETS isptr EXPORT isptr FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(EXPORT isptr NAMESPACE isptr:: FILE isptr-exports.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/isptr)
 
-install(FILES ${SRCDIR}/modules/isptr.cppm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/intrusive_shared_ptr)
+install(FILES ${SRCDIR}/modules/isptr.cppm DESTINATION ${CMAKE_INSTALL_LIBDIR}/isptr)
 
 
 configure_package_config_file(

cmake/isptr-config.cmake.in

@@ -13,23 +13,18 @@
 if(NOT TARGET isptr::isptr)
     include(${CMAKE_CURRENT_LIST_DIR}/isptr-exports.cmake)
 
-    get_filename_component(IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-    get_filename_component(IMPORT_PREFIX "${IMPORT_PREFIX}" PATH)
-    get_filename_component(IMPORT_PREFIX "${IMPORT_PREFIX}" PATH)
-    if(_IMPORT_PREFIX STREQUAL "/")
-      set(IMPORT_PREFIX "")
-    endif()
-
-    set(ISPTR_MODULES_BASE_DIRS "${IMPORT_PREFIX}/include/intrusive_shared_ptr")
-    set(ISPTR_MODULES_FILES "${IMPORT_PREFIX}/include/intrusive_shared_ptr/isptr.cppm")
+    get_filename_component(MYPATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    
+    set(ISPTR_MODULES_BASE_DIRS "${MYPATH}")
+    set(ISPTR_MODULES_FILES "${MYPATH}/isptr.cppm")
 
     function(isptr_add_module target_name visibility)
         target_sources(${target_name} ${visibility}
             FILE_SET isptr_module TYPE CXX_MODULES BASE_DIRS ${ISPTR_MODULES_BASE_DIRS} FILES ${ISPTR_MODULES_FILES}
         )
     endfunction()
 
-    set(IMPORT_PREFIX)
+    set(MYPATH)
 
 endif()