xo-pykalmanfilter: build: update to latest xo-cmake macros

This commit is contained in:
Roland Conybeare 2024-09-14 19:24:15 -05:00
commit 94e59d7248
2 changed files with 41 additions and 7 deletions

View file

@ -4,10 +4,23 @@ cmake_minimum_required(VERSION 3.10)
project(xo_pykalmanfilter VERSION 1.0) project(xo_pykalmanfilter VERSION 1.0)
include(GNUInstallDirs)
include(cmake/xo-bootstrap-macros.cmake) include(cmake/xo-bootstrap-macros.cmake)
xo_cxx_toplevel_options() xo_cxx_toplevel_options3()
# ----------------------------------------------------------------
# c++ settings
set(PROJECT_CXX_FLAGS "")
#set(PROJECT_CXX_FLAGS "-fconcepts-diagnostics-depth=2")
add_definitions(${PROJECT_CXX_FLAGS})
# ----------------------------------------------------------------
add_subdirectory(src/pykalmanfilter) add_subdirectory(src/pykalmanfilter)
# ----------------------------------------------------------------
# provide find_package() support
xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets) xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)

View file

@ -1,14 +1,35 @@
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL "prefix")) # ----------------------------------------------------------------
# default to typical install location for xo-project-macros # for example:
set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake) # $ PREFIX=/usr/local # for example
# $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build
#
# will get
# CMAKE_MODULE_PATH
# from xo-cmake-config --cmake-module-path
#
# and expect .cmake macros in
# CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake
# ----------------------------------------------------------------
find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED)
if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND")
message(FATAL "could not find xo-cmake-config executable")
endif() endif()
message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
if (NOT XO_SUBMODULE_BUILD) if (NOT XO_SUBMODULE_BUILD)
message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") # default to typical install location for xo-project-macros
execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
endif()
endif() endif()
# needs to have been installed somewhere on CMAKE_MODULE_PATH, # needs to have been installed somewhere on CMAKE_MODULE_PATH,
# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX) # (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
# #
include(xo_macros/xo-project-macros) include(xo_macros/xo_cxx)
xo_cxx_bootstrap_message()