Merge branch 'master' into ethanmusser/bug/1532-install-interface-libdir

martin4861 · web-flow · commit c28225e54dab · 2025-11-14T10:06:21.000+01:00
diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt
@@ -92,12 +92,13 @@ install(
   NAMESPACE swiftnav::
 )
 
+set(LIBSBP_CFG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/libsbp/cmake")
 configure_package_config_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/libsbpConfig.cmake.in
-  libsbpConfig.cmake
-  INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/libsbpConfig.cmake
+  INSTALL_DESTINATION ${LIBSBP_CFG_INSTALL_DIR}
 )
 install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbpConfig.cmake"
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/libsbp/cmake
+  DESTINATION ${LIBSBP_CFG_INSTALL_DIR}
 )

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,13 @@ install(`
`92`	`92`	`NAMESPACE swiftnav::`
`93`	`93`	`)`
`94`	`94`
	`95`	`+set(LIBSBP_CFG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/libsbp/cmake")`
`95`	`96`	`configure_package_config_file(`
`96`	`97`	`${CMAKE_CURRENT_SOURCE_DIR}/libsbpConfig.cmake.in`
`97`		`- libsbpConfig.cmake`
`98`		`- INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}`
	`98`	`+ ${CMAKE_CURRENT_BINARY_DIR}/libsbpConfig.cmake`
	`99`	`+ INSTALL_DESTINATION ${LIBSBP_CFG_INSTALL_DIR}`
`99`	`100`	`)`
`100`	`101`	`install(`
`101`	`102`	`FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbpConfig.cmake"`
`102`		`- DESTINATION ${CMAKE_INSTALL_DATADIR}/libsbp/cmake`
	`103`	`+ DESTINATION ${LIBSBP_CFG_INSTALL_DIR}`
`103`	`104`	`)`